Merge branch 'develop-feature-updatedDependencies' into develop-feature-update-nikic-php-parser

amosfolz · web-flow · commit 2e4d62a5ef40 · 2019-06-23T16:25:25.000-04:00
diff --git a/app/sprinkles/core/composer.json b/app/sprinkles/core/composer.json
@@ -32,27 +32,26 @@
         "illuminate/database": "5.8.*",
         "illuminate/events": "5.8.*",
         "illuminate/filesystem": "5.8.*",
-        "league/csv": "^8.1",
+        "league/csv": "^9.2.1",
         "league/flysystem": "~1.0",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-cached-adapter": "~1.0",
         "league/flysystem-rackspace": "~1.0",
         "league/flysystem-sftp": "~1.0",
         "monolog/monolog": "^1",
         "phpmailer/phpmailer": "5.2.10",
-        "rockettheme/toolbox": "1.3.1",
         "slim/csrf": "^0.8",
         "slim/slim": "^3",
-        "slim/twig-view": "^1.2",
+        "slim/twig-view": "^2.5",
         "symfony/http-foundation": "*",
-        "twig/twig": "^1.18",
-        "userfrosting/assets": "^5.0.4",
-        "userfrosting/config": "~4.2.0",
-        "userfrosting/cache": "~4.2.0",
-        "userfrosting/fortress": "~4.2.0",
-        "userfrosting/i18n": "~4.2.0",
-        "userfrosting/session": "~4.2.2",
-        "userfrosting/support": "~4.2.0",
+        "twig/twig": "^2.11",
+        "userfrosting/assets": "^6.0.0",
+        "userfrosting/config": "~4.3.0",
+        "userfrosting/cache": "~4.3.0",
+        "userfrosting/fortress": "~4.3.0",
+        "userfrosting/i18n": "~4.3.0",
+        "userfrosting/session": "~4.3.0",
+        "userfrosting/support": "~4.3.0",
         "vlucas/phpdotenv": "^2"
     },
     "autoload": {
diff --git a/app/sprinkles/core/src/Bakery/MigrateCommand.php b/app/sprinkles/core/src/Bakery/MigrateCommand.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use UserFrosting\Sprinkle\Core\Bakery\Helper\ConfirmableTrait;
+use UserFrosting\Sprinkle\Core\Database\Migrator\Migrator;
 use UserFrosting\System\Bakery\BaseCommand;
 
 /**
@@ -79,13 +80,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $migrated = $migrator->run(['pretend' => $pretend, 'step' => $step]);
         } catch (\Exception $e) {
-            $this->io->writeln($migrator->getNotes());
+            $this->displayNotes($migrator);
             $this->io->error($e->getMessage());
             exit(1);
         }
 
         // Get notes and display them
-        $this->io->writeln($migrator->getNotes());
+        $this->displayNotes($migrator);
 
         // If all went well, there's no fatal errors and we have migrated
         // something, show some success
@@ -128,4 +129,16 @@ protected function setupMigrator(InputInterface $input)
 
         return $migrator;
     }
+
+    /**
+     * Display migrator notes.
+     *
+     * @param Migrator $migrator
+     */
+    protected function displayNotes(Migrator $migrator)
+    {
+        if (!empty($notes = $migrator->getNotes())) {
+            $this->io->writeln($notes);
+        }
+    }
 }
diff --git a/app/sprinkles/core/src/Bakery/MigrateRefreshCommand.php b/app/sprinkles/core/src/Bakery/MigrateRefreshCommand.php
@@ -71,13 +71,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $rolledback = $migrator->rollback(['pretend' => false, 'steps' => $steps]);
         } catch (\Exception $e) {
-            $this->io->writeln($migrator->getNotes());
+            $this->displayNotes($migrator);
             $this->io->error($e->getMessage());
             exit(1);
         }
 
         // Get notes and display them
-        $this->io->writeln($migrator->getNotes());
+        $this->displayNotes($migrator);
 
         // Stop if nothing was rolledback
         if (empty($rolledback)) {
@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Run back up again
         $migrated = $migrator->run(['pretend' => false, 'step' => false]);
-        $this->io->writeln($migrator->getNotes());
+        $this->displayNotes($migrator);
 
         // If all went well, there's no fatal errors and we have migrated
         // something, show some success
diff --git a/app/sprinkles/core/src/Bakery/MigrateResetCommand.php b/app/sprinkles/core/src/Bakery/MigrateResetCommand.php
@@ -87,13 +87,13 @@ protected function performReset(InputInterface $input)
         try {
             $resetted = $migrator->reset($pretend);
         } catch (\Exception $e) {
-            $this->io->writeln($migrator->getNotes());
+            $this->displayNotes($migrator);
             $this->io->error($e->getMessage());
             exit(1);
         }
 
         // Get notes and display them
-        $this->io->writeln($migrator->getNotes());
+        $this->displayNotes($migrator);
 
         // Delete the repository
         if (!$pretend && $migrator->repositoryExists()) {
diff --git a/app/sprinkles/core/src/Bakery/MigrateRollbackCommand.php b/app/sprinkles/core/src/Bakery/MigrateRollbackCommand.php
@@ -80,13 +80,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $migrated = $migrator->rollback(['pretend' => $pretend, 'steps' => $steps]);
             }
         } catch (\Exception $e) {
-            $this->io->writeln($migrator->getNotes());
+            $this->displayNotes($migrator);
             $this->io->error($e->getMessage());
             exit(1);
         }
 
         // Get notes and display them
-        $this->io->writeln($migrator->getNotes());
+        $this->displayNotes($migrator);
 
         // If all went well, there's no fatal errors and we have migrated
         // something, show some success
diff --git a/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateCommandTest.php b/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();
diff --git a/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRefreshCommandTest.php b/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();
diff --git a/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateResetCommandTest.php b/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();
diff --git a/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateRollbackCommandTest.php b/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();
diff --git a/app/sprinkles/core/tests/Integration/Bakery/BakeryMigrateStatusCommandTest.php b/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();
diff --git a/app/sprinkles/core/tests/Integration/Database/Migrator/MigrationRepositoryTest.php b/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();
diff --git a/app/sprinkles/core/tests/Integration/Seeder/SeederTests.php b/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
      */
diff --git a/app/sprinkles/core/tests/Unit/Database/Relations/BelongsToManyThroughTest.php b/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();
diff --git a/app/sprinkles/core/tests/Unit/Sprunje/SprunjeTest.php b/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();
diff --git a/app/tests/Unit/SprinkleManagerTest.php b/app/tests/Unit/SprinkleManagerTest.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,13 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`80`	`80`	`$migrated = $migrator->rollback(['pretend' => $pretend, 'steps' => $steps]);`
`81`	`81`	`}`
`82`	`82`	`} catch (\Exception $e) {`
`83`		`- $this->io->writeln($migrator->getNotes());`
	`83`	`+ $this->displayNotes($migrator);`
`84`	`84`	`$this->io->error($e->getMessage());`
`85`	`85`	`exit(1);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// Get notes and display them`
`89`		`- $this->io->writeln($migrator->getNotes());`
	`89`	`+ $this->displayNotes($migrator);`
`90`	`90`
`91`	`91`	`// If all went well, there's no fatal errors and we have migrated`
`92`	`92`	`// something, show some success`