Merge branch 'master' into 5.5

Author: dmitry-ivanov

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 install:
   - composer update

composer.json

@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
-        "mockery/mockery": "^0.9",
+        "mockery/mockery": "^1.0",
         "illuminated/testing-tools": "5.5.*"
     },
     "autoload": {

composer.lock

@@ -4,25 +4,24 @@
 
 use Illuminated\Testing\TestingTools;
 use Mockery;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+
+Mockery::globalHelpers();
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     use TestingTools;
+    use MockeryPHPUnitIntegration;
 
     public static $functions;
 
     protected function setUp()
     {
-        self::$functions = Mockery::mock();
-    }
-
-    protected function shouldReceiveExecCallOnceWith($with)
-    {
-        self::$functions->shouldReceive('exec')->with($with)->once();
+        self::$functions = mock();
     }
 
-    protected function tearDown()
+    protected function expectsExecWith($command)
     {
-        Mockery::close();
+        self::$functions->expects()->exec($command);
     }
 }

tests/HelperFunctions/TestCase.php

@@ -3,7 +3,6 @@
 namespace Illuminated\Helpers\HelperFunctions\Tests\Artisan;
 
 use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
-use Mockery;
 
 /**
  * @runTestsInSeparateProcesses
@@ -14,39 +13,39 @@ class CallInBackgroundTest extends TestCase
     /** @test */
     public function it_works_without_optional_before_and_after_parameters()
     {
-        $mock = Mockery::mock('alias:Illuminated\Helpers\Artisan\Command');
-        $mock->shouldReceive('factory')->withArgs(['test command', null, null])->once()->andReturnSelf();
-        $mock->shouldReceive('runInBackground')->withNoArgs()->once();
+        $mock = mock('alias:Illuminated\Helpers\Artisan\Command');
+        $mock->expects()->factory('test command', null, null)->andReturnSelf();
+        $mock->expects()->runInBackground();
 
         call_in_background('test command');
     }
 
     /** @test */
     public function it_works_with_optional_before_parameter()
     {
-        $mock = Mockery::mock('alias:Illuminated\Helpers\Artisan\Command');
-        $mock->shouldReceive('factory')->withArgs(['test command', 'before command', null])->once()->andReturnSelf();
-        $mock->shouldReceive('runInBackground')->withNoArgs()->once();
+        $mock = mock('alias:Illuminated\Helpers\Artisan\Command');
+        $mock->expects()->factory('test command', 'before command', null)->andReturnSelf();
+        $mock->expects()->runInBackground();
 
         call_in_background('test command', 'before command');
     }
 
     /** @test */
     public function it_works_with_optional_after_parameter()
     {
-        $mock = Mockery::mock('alias:Illuminated\Helpers\Artisan\Command');
-        $mock->shouldReceive('factory')->withArgs(['test command', null, 'after command'])->once()->andReturnSelf();
-        $mock->shouldReceive('runInBackground')->withNoArgs()->once();
+        $mock = mock('alias:Illuminated\Helpers\Artisan\Command');
+        $mock->expects()->factory('test command', null, 'after command')->andReturnSelf();
+        $mock->expects()->runInBackground();
 
         call_in_background('test command', null, 'after command');
     }
 
     /** @test */
     public function it_works_with_optional_before_and_after_parameters_together()
     {
-        $mock = Mockery::mock('alias:Illuminated\Helpers\Artisan\Command');
-        $mock->shouldReceive('factory')->withArgs(['test command', 'before', 'after'])->once()->andReturnSelf();
-        $mock->shouldReceive('runInBackground')->withNoArgs()->once();
+        $mock = mock('alias:Illuminated\Helpers\Artisan\Command');
+        $mock->expects()->factory('test command', 'before', 'after')->andReturnSelf();
+        $mock->expects()->runInBackground();
 
         call_in_background('test command', 'before', 'after');
     }

tests/HelperFunctions/artisan/CallInBackgroundTest.php

@@ -3,16 +3,15 @@
 namespace Illuminated\Helpers\Artisan;
 
 use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
-use Mockery;
 
 class CommandTest extends TestCase
 {
     protected function setUp()
     {
         parent::setUp();
 
-        $phpBinaryMock = Mockery::mock('overload:Symfony\Component\Process\PhpExecutableFinder');
-        $phpBinaryMock->shouldReceive('find')->withNoArgs()->once()->andReturn('php');
+        $phpBinaryMock = mock('overload:Symfony\Component\Process\PhpExecutableFinder');
+        $phpBinaryMock->expects()->find()->andReturn('php');
     }
 
     /** @test */
@@ -32,7 +31,7 @@ public function it_has_static_constructor_named_factory()
     /** @test */
     public function it_can_run_command_in_background()
     {
-        $this->shouldReceiveExecCallOnceWith('(php artisan test:command) > /dev/null 2>&1 &');
+        $this->expectsExecWith('(php artisan test:command) > /dev/null 2>&1 &');
 
         $command = Command::factory('test:command');
         $command->runInBackground();
@@ -41,7 +40,7 @@ public function it_can_run_command_in_background()
     /** @test */
     public function run_in_background_supports_before_subcommand()
     {
-        $this->shouldReceiveExecCallOnceWith('(before command && php artisan test:command) > /dev/null 2>&1 &');
+        $this->expectsExecWith('(before command && php artisan test:command) > /dev/null 2>&1 &');
 
         $command = Command::factory('test:command', 'before command');
         $command->runInBackground();
@@ -50,7 +49,7 @@ public function run_in_background_supports_before_subcommand()
     /** @test */
     public function run_in_background_supports_after_subcommand()
     {
-        $this->shouldReceiveExecCallOnceWith('(php artisan test:command && after command) > /dev/null 2>&1 &');
+        $this->expectsExecWith('(php artisan test:command && after command) > /dev/null 2>&1 &');
 
         $command = Command::factory('test:command', null, 'after command');
         $command->runInBackground();
@@ -59,7 +58,7 @@ public function run_in_background_supports_after_subcommand()
     /** @test */
     public function run_in_background_supports_before_and_after_subcommands_together()
     {
-        $this->shouldReceiveExecCallOnceWith('(before && php artisan test:command && after) > /dev/null 2>&1 &');
+        $this->expectsExecWith('(before && php artisan test:command && after) > /dev/null 2>&1 &');
 
         $command = Command::factory('test:command', 'before', 'after');
         $command->runInBackground();
@@ -72,7 +71,7 @@ public function run_in_background_supports_before_and_after_subcommands_together
      */
     public function it_supports_overriding_of_artisan_binary_through_constant()
     {
-        $this->shouldReceiveExecCallOnceWith('(before && php custom-artisan test:command && after) > /dev/null 2>&1 &');
+        $this->expectsExecWith('(before && php custom-artisan test:command && after) > /dev/null 2>&1 &');
 
         define('ARTISAN_BINARY', 'custom-artisan');
         $command = Command::factory('test:command', 'before', 'after');

tests/HelperFunctions/classes/Artisan/CommandTest.php

@@ -3,17 +3,14 @@
 namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
 
 use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
-use Mockery;
 
 class DbMysqlNowTest extends TestCase
 {
     /** @test */
     public function it_returns_valid_mysql_datetime()
     {
-        $mock = Mockery::mock('alias:Illuminate\Support\Facades\DB');
-        $mock->shouldReceive('selectOne')->withArgs(['select now() as now'])->once()->andReturnUsing(function () {
-            return (object) ['now' => '2016-09-17 18:49:46'];
-        });
+        $mock = mock('alias:Illuminate\Support\Facades\DB');
+        $mock->expects()->selectOne('select now() as now')->andReturn((object) ['now' => '2016-09-17 18:49:46']);
 
         $this->assertEquals('2016-09-17 18:49:46', db_mysql_now());
     }

tests/HelperFunctions/db/DbMysqlNowTest.php

@@ -3,32 +3,24 @@
 namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
 
 use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
-use Mockery;
 
 class DbMysqlVariableTest extends TestCase
 {
     /** @test */
     public function it_returns_false_for_unexisting_mysql_variable()
     {
-        $mock = Mockery::mock('alias:Illuminate\Support\Facades\DB');
-        $mock->shouldReceive('selectOne')
-            ->withArgs(['show variables where variable_name = ?', ['fake']])
-            ->once()
-            ->andReturnNull();
+        $mock = mock('alias:Illuminate\Support\Facades\DB');
+        $mock->expects()->selectOne('show variables where variable_name = ?', ['fake'])->andReturnNull();
 
         $this->assertFalse(db_mysql_variable('fake'));
     }
 
     /** @test */
     public function it_returns_value_for_existing_mysql_variable()
     {
-        $mock = Mockery::mock('alias:Illuminate\Support\Facades\DB');
-        $mock->shouldReceive('selectOne')
-             ->withArgs(['show variables where variable_name = ?', ['hostname']])
-             ->once()
-             ->andReturnUsing(function () {
-                 return (object) ['Variable_name' => 'hostname', 'Value' => 'localhost'];
-             });
+        $mock = mock('alias:Illuminate\Support\Facades\DB');
+        $mock->expects()->selectOne('show variables where variable_name = ?', ['hostname'])
+                        ->andReturn((object) ['Variable_name' => 'hostname', 'Value' => 'localhost']);
 
         $this->assertEquals('localhost', db_mysql_variable('hostname'));
     }