Updated PHPUnit dependency (Ref #779)

Author: lcharette

app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateCommandTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Bakery;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use UserFrosting\Sprinkle\Core\Bakery\MigrateCommand;
@@ -21,6 +22,8 @@
  */
 class BakeryMigrateCommandTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRefreshCommandTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Bakery;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use UserFrosting\Sprinkle\Core\Bakery\MigrateRefreshCommand;
@@ -21,6 +22,8 @@
  */
 class BakeryMigrateRefreshCommandTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateResetCommandTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Bakery;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use UserFrosting\Sprinkle\Core\Bakery\MigrateResetCommand;
@@ -21,6 +22,8 @@
  */
 class BakeryMigrateResetCommandTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRollbackCommandTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Bakery;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use UserFrosting\Sprinkle\Core\Bakery\MigrateRollbackCommand;
@@ -21,6 +22,8 @@
  */
 class BakeryMigrateRollbackCommandTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateStatusCommandTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Bakery;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use UserFrosting\Sprinkle\Core\Bakery\MigrateStatusCommand;
@@ -21,6 +22,8 @@
  */
 class BakeryMigrateStatusCommandTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Integration/Database/Migrator/MigrationRepositoryTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Integration\Database\Migrator;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Illuminate\Support\Collection;
 use UserFrosting\Sprinkle\Core\Database\Migrator\DatabaseMigrationRepository;
 use UserFrosting\Tests\TestCase;
@@ -20,6 +21,8 @@
  */
 class MigrationRepositoryTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Integration/Seeder/SeederTests.php

@@ -11,15 +11,18 @@
 namespace UserFrosting\Tests\Integration\Seeder;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Interop\Container\ContainerInterface;
 use UserFrosting\UniformResourceLocator\ResourceLocator;
 use UserFrosting\Sprinkle\Core\Database\Seeder\Seeder;
 use UserFrosting\Sprinkle\Core\Database\Seeder\SeedInterface;
 use UserFrosting\Tests\TestCase;
 use Slim\Container;
 
-class DatabaseTests extends TestCase
+class SeederTests extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     /**
      * @var Container $fakeCi
      */

app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php

@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 use UserFrosting\Sprinkle\Core\Database\Builder as QueryBuilder;
 use UserFrosting\Sprinkle\Core\Database\Models\Model;
@@ -23,6 +24,8 @@
  */
 class BelongsToManyThroughTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/sprinkles/core/tests/Unit/Sprunje/SprunjeTest.php

@@ -11,6 +11,7 @@
 namespace UserFrosting\Sprinkle\Core\Tests\Unit\Sprunje;
 
 use Mockery as m;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 use UserFrosting\Sprinkle\Core\Database\Builder as Builder;
 use UserFrosting\Sprinkle\Core\Database\Models\Model;
@@ -23,6 +24,8 @@
  */
 class SprunjeTest extends TestCase
 {
+    use MockeryPHPUnitIntegration;
+
     public function tearDown()
     {
         parent::tearDown();

app/tests/Unit/SprinkleManagerTest.php

@@ -61,42 +61,34 @@ public function testGetSetSprinklesPath(SprinkleManager $sprinkleManager)
 
     /**
      * @depends testConstructor
-     * @param  SprinkleManager $sprinkleManager
-     * @return SprinkleManager
-     */
-    public function testInitFromSchema(SprinkleManager $sprinkleManager)
-    {
-        $sprinkleManager->initFromSchema(__DIR__ . '/data/sprinkles.json');
-
-        return $sprinkleManager;
-    }
-
-    /**
-     * @depends testConstructor
-     * @expectedException \UserFrosting\Support\Exception\FileNotFoundException
      */
     public function testLoadSprinkleWithNonExistingFile()
     {
         $sprinkleManager = new SprinkleManager($this->fakeCi);
+        $this->expectException(\UserFrosting\Support\Exception\FileNotFoundException::class);
         $sprinkleManager->initFromSchema('foo.json');
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testConstructor
      * @param SprinkleManager $sprinkleManager
+     * @return SprinkleManager
      */
     public function testGetSprinkles(SprinkleManager $sprinkleManager)
     {
+        $sprinkleManager->initFromSchema(__DIR__ . '/data/sprinkles.json');
         $sprinkles = $sprinkleManager->getSprinkles();
         $this->assertEquals([
             'foo'  => null,
             'bar'  => null,
             'test' => new \UserFrosting\Sprinkle\Test\Test(),
         ], $sprinkles);
+
+        return $sprinkleManager;
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @param SprinkleManager $sprinkleManager
      */
     public function testGetSprinkleNames(SprinkleManager $sprinkleManager)
@@ -106,7 +98,7 @@ public function testGetSprinkleNames(SprinkleManager $sprinkleManager)
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @depends testGetSprinkleNames
      * @param string          $sprinkleName
      * @param bool            $isAvailable
@@ -133,7 +125,7 @@ public function testIsAvailable($sprinkleName, $isAvailable, SprinkleManager $sp
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @param string          $sprinkleName
      * @param SprinkleManager $sprinkleManager
      * @testWith        ["foo"]
@@ -148,31 +140,32 @@ public function testGetSprinklePath($sprinkleName, SprinkleManager $sprinkleMana
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @depends testGetSprinklePath
-     * @expectedException \UserFrosting\Support\Exception\FileNotFoundException
      * @param SprinkleManager $sprinkleManager
      */
     public function testGetSprinklePathWherePathDoesntExist(SprinkleManager $sprinkleManager)
     {
         $basePath = 'app/tests/Unit/foo/';
         $sprinkleManager->setSprinklesPath($basePath);
+
+        $this->expectException(\UserFrosting\Support\Exception\FileNotFoundException::class);
         $sprinkleManager->getSprinklePath('foo');
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @depends testGetSprinklePath
-     * @expectedException \UserFrosting\Support\Exception\FileNotFoundException
      * @param SprinkleManager $sprinkleManager
      */
     public function testGetSprinklePathWhereSprinkleDoesntExist(SprinkleManager $sprinkleManager)
     {
+        $this->expectException(\UserFrosting\Support\Exception\FileNotFoundException::class);
         $sprinkleManager->getSprinklePath('blah');
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @param SprinkleManager $sprinkleManager
      */
     public function testRegisterAllServices(SprinkleManager $sprinkleManager)
@@ -185,19 +178,20 @@ public function testRegisterAllServices(SprinkleManager $sprinkleManager)
         ->getMock();
         class_alias('foo', 'UserFrosting\Sprinkle\Test\ServicesProvider\ServicesProvider');
 
-        $sprinkleManager->registerAllServices();
+        $this->assertNull($sprinkleManager->registerAllServices());
     }
 
     /**
-     * @depends testInitFromSchema
+     * @depends testGetSprinkles
      * @depends testGetSprinklePath
      * @param SprinkleManager $sprinkleManager
      */
     public function testAddResources(SprinkleManager $sprinkleManager)
     {
         $basePath = 'app/tests/Unit/data/';
         $sprinkleManager->setSprinklesPath($basePath);
-        $sprinkleManager->addResources();
+
+        $this->assertNull($sprinkleManager->addResources());
     }
 
     /**
@@ -215,11 +209,11 @@ public function testLoadSprinkleWithTxtFile()
 
     /**
      * @depends testConstructor
-     * @expectedException \UserFrosting\Support\Exception\JsonException
      */
     public function testLoadSprinkleWithBadJson()
     {
         $sprinkleManager = new SprinkleManager($this->fakeCi);
+        $this->expectException(\UserFrosting\Support\Exception\JsonException::class);
         $sprinkleManager->initFromSchema(__DIR__ . '/data/sprinkles-bad.json');
     }