-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #243 from lemberg/feature/235-drop-ubuntu-1604
Drop support of ubuntu/focal64
- Loading branch information
Showing
12 changed files
with
215 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| --- | ||
| - src: oefenweb.swapfile | ||
| version: v2.0.32 | ||
| version: v2.0.33 | ||
| - src: geerlingguy.mailhog | ||
| version: 2.2.0 | ||
| - src: geerlingguy.mysql | ||
| version: 3.3.0 | ||
| version: 3.3.1 | ||
| - src: t2l.php | ||
| version: 1.4.0 | ||
| version: 1.5.0 | ||
| - src: t2l.composer | ||
| version: 2.0.3 | ||
| version: 2.0.4 | ||
| - src: t2l.java | ||
| version: 1.3.2 | ||
| version: 1.3.3 | ||
| - src: t2l.solr | ||
| version: 2.2.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Lemberg\Draft\Environment\Config\Update\Step; | ||
|
|
||
| use Lemberg\Draft\Environment\Config\Update\UpdateStepInterface; | ||
|
|
||
| /** | ||
| * Updates guest OS to Ubuntu 20.04. | ||
| * | ||
| * @link https://github.com/lemberg/draft-environment/issues/235 | ||
| */ | ||
| final class Xenial2Focal extends AbstractUpdateStep implements UpdateStepInterface { | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getWeight(): int { | ||
| return 9; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function update(array &$config): void { | ||
| if (array_key_exists('vagrant', $config)) { | ||
| if (array_key_exists('box', $config['vagrant'])) { | ||
| if ($config['vagrant']['box'] === 'ubuntu/xenial64') { | ||
| $config['vagrant']['box'] = 'ubuntu/focal64'; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Lemberg\Tests\Unit\Draft\Environment\Config\Update\Step; | ||
|
|
||
| use Composer\Composer; | ||
| use Composer\Config as ComposerConfig; | ||
| use Composer\IO\IOInterface; | ||
| use Lemberg\Draft\Environment\Config\Config; | ||
| use Lemberg\Draft\Environment\Config\Manager\UpdateManager; | ||
| use Lemberg\Draft\Environment\Config\Update\Step\Xenial2Focal; | ||
| use Lemberg\Draft\Environment\Utility\Filesystem; | ||
| use org\bovigo\vfs\vfsStream; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| /** | ||
| * Tests updating the guest OS box configuration. | ||
| * | ||
| * @link https://github.com/lemberg/draft-environment/issues/204 | ||
| * | ||
| * @covers \Lemberg\Draft\Environment\Config\Update\Step\AbstractUpdateStep | ||
| * @covers \Lemberg\Draft\Environment\Config\Update\Step\Xenial2Focal | ||
| */ | ||
| final class Xenial2FocalTest extends TestCase { | ||
|
|
||
| /** | ||
| * @var \Composer\Composer | ||
| */ | ||
| private $composer; | ||
|
|
||
| /** | ||
| * @var \Composer\IO\IOInterface | ||
| */ | ||
| private $io; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $root; | ||
|
|
||
| /** | ||
| * @var \Lemberg\Draft\Environment\Config\Manager\UpdateManagerInterface | ||
| */ | ||
| private $configUpdateManager; | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function setUp(): void { | ||
| $this->composer = new Composer(); | ||
| $this->composer->setConfig(new ComposerConfig()); | ||
| $this->io = $this->createMock(IOInterface::class); | ||
|
|
||
| // Mock source and target configuration directories. | ||
| $this->root = vfsStream::setup()->url(); | ||
| $fs = new Filesystem(); | ||
| $fs->mkdir(["$this->root/source", "$this->root/target"]); | ||
|
|
||
| $configObject = new Config("$this->root/source", "$this->root/target"); | ||
| $this->configUpdateManager = new UpdateManager($this->composer, $this->io, $configObject); | ||
| } | ||
|
|
||
| /** | ||
| * Tests step weight getter. | ||
| */ | ||
| final public function testGetWeight(): void { | ||
| $step = new Xenial2Focal($this->composer, $this->io, $this->configUpdateManager); | ||
| self::assertSame(9, $step->getWeight()); | ||
| } | ||
|
|
||
| /** | ||
| * Tests update step execution. | ||
| * | ||
| * @param array<string,mixed> $config | ||
| * @param array<string,mixed> $expectedConfig | ||
| * | ||
| * @dataProvider updateDataProvider | ||
| */ | ||
| final public function testUpdate(array $config, array $expectedConfig): void { | ||
| $step = new Xenial2Focal($this->composer, $this->io, $this->configUpdateManager); | ||
|
|
||
| $step->update($config); | ||
| self::assertSame($expectedConfig, $config); | ||
| } | ||
|
|
||
| /** | ||
| * Data provider for the ::testUpdate(). | ||
| * | ||
| * @return array<int,array<int,string|array<string,mixed>>> | ||
| */ | ||
| final public function updateDataProvider(): array { | ||
| return [ | ||
| [ | ||
| [], | ||
| [], | ||
| ], | ||
| [ | ||
| [ | ||
| 'vagrant' => [ | ||
| 'box_version' => '>= 0', | ||
| ], | ||
| ], | ||
| [ | ||
| 'vagrant' => [ | ||
| 'box_version' => '>= 0', | ||
| ], | ||
| ], | ||
| ], | ||
| [ | ||
| [ | ||
| 'vagrant' => [ | ||
| 'box' => 'ubuntu/xenial64', | ||
| 'box_version' => '>= 0', | ||
| ], | ||
| ], | ||
| [ | ||
| 'vagrant' => [ | ||
| 'box' => 'ubuntu/focal64', | ||
| 'box_version' => '>= 0', | ||
| ], | ||
| ], | ||
| ], | ||
| [ | ||
| [ | ||
| 'vagrant' => [ | ||
| 'box' => 'ubuntu/bionic64', | ||
| 'box_version' => '>= 0', | ||
| ], | ||
| ], | ||
| [ | ||
| 'vagrant' => [ | ||
| 'box' => 'ubuntu/bionic64', | ||
| 'box_version' => '>= 0', | ||
| ], | ||
| ], | ||
| ], | ||
| ]; | ||
| } | ||
|
|
||
| } |