Skip to content

Commit

Permalink
Merge pull request #18 from unleashedtech/magento2
Browse files Browse the repository at this point in the history
Magento2 Release
  • Loading branch information
dshumakerUT authored Feb 2, 2022
2 parents 34492b6 + 19c0f99 commit ac4e947
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi

## [Unreleased][unreleased]

## [0.3.15] - 2022-02-02

### Changed

- New Magento 2 recipe.

## [0.3.14] - 2022-02-01

### Changed
Expand Down Expand Up @@ -242,7 +248,8 @@ config vars to be overridden.

**Initial release!**

[unreleased]: https://github.com/unleashedtech/deployer-recipes/compare/0.3.14...main
[unreleased]: https://github.com/unleashedtech/deployer-recipes/compare/0.3.15...main
[0.3.15]: https://github.com/unleashedtech/deployer-recipes/compare/0.3.14...0.3.15
[0.3.14]: https://github.com/unleashedtech/deployer-recipes/compare/0.3.13...0.3.14
[0.3.13]: https://github.com/unleashedtech/deployer-recipes/compare/0.3.12...0.3.13
[0.3.12]: https://github.com/unleashedtech/deployer-recipes/compare/0.3.11...0.3.12
Expand Down
2 changes: 1 addition & 1 deletion cms/magento/magento2.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ static function (): void {
run('{{mage}} config:set system/backup/functionality_enabled 1');
}
);
} catch (RunException $e) {
} catch (RunException) {
return;
}

Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@
}
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"require-dev": {
"deployer/deployer": "7.0.0-rc.4",
Expand Down
2 changes: 1 addition & 1 deletion src/VirtualMachine/Docksal/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function run(string $command): string
public function import(string $file): string
{
$this->drush('sql-drop -y');
$isCompressed = str_ends_with($file, '.gz');
$isCompressed = \str_ends_with($file, '.gz');
if ($isCompressed) {
return runLocally(\sprintf('zcat < %s | fin db import', $file));
}
Expand Down
2 changes: 1 addition & 1 deletion src/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @param mixed $defaultValue
* The config parameter value to conditionally set.
*/
function fill(string $var, $defaultValue): void
function fill(string $var, mixed $defaultValue): void
{
if (! has($var)) {
set($var, $defaultValue);
Expand Down

0 comments on commit ac4e947

Please sign in to comment.