Skip to content

Commit 999e599

Browse files
committed
Merge branch 'hotfix/composer_install_error'
* hotfix/composer_install_error: compatible with Symfony\Component\Console\Application::getHelp(): string Error on rerunning composer install, with different composer.phar versions (PR #62)
2 parents 4a6485d + 3869291 commit 999e599

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
## [v5.1.2] 2022-03-01
9+
- Bugfix: Error on rerunning composer install [Issue #62](https://github.com/OXIDprojects/oxrun/issues/62)
10+
11+
### Fixed
812
## [v5.1.1] 2021-10-12
913
### Fixed
1014
- Bugfix: configs for theme are no longer stored in the oxid configurations yaml, too. (PR #61)
11-
15+
1216
## [v5.1.0] 2021-09-07
1317
### Changed
1418
- `oxrun-light` is now officially documented.

services.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040
- { name: console.command, command: 'module:list' }
4141
Oxrun\Command\Module\ReloadCommand:
4242
tags:
43-
- { name: console.command }
43+
- { name: console.command, command: 'module:reload' }
4444
autowire: true
4545
Oxrun\Command\Oxid\ShopListCommand:
4646
tags:
@@ -59,37 +59,37 @@ services:
5959
- { name: console.command, command: 'views:update' }
6060
Oxrun\Command\Deploy\UpdateModuleConfigCommand:
6161
tags:
62-
- { name: console.command }
62+
- { name: console.command, command: 'deploy:update-module-config' }
6363
autowire: true
6464
Oxrun\Command\Deploy\ModuleApplyConfigurationLightCommand:
6565
tags:
66-
- { name: console.command }
66+
- { name: console.command, command: 'deploy:module-apply-configuration-light' }
6767
autowire: true
6868
Oxrun\Command\Deploy\ModuleActivatorCommand:
6969
tags:
70-
- { name: console.command }
70+
- { name: console.command, command: 'deploy:module-activator' }
7171
autowire: true
7272
Oxrun\Command\Config\GetCommand:
7373
tags:
74-
- { name: console.command }
74+
- { name: console.command, command: 'config:get' }
7575
autowire: true
7676
Oxrun\Command\Deploy\GenerateModuleActivatorCommand:
7777
tags:
78-
- { name: console.command }
78+
- { name: console.command, command: 'deploy:generate:module-activator' }
7979
autowire: true
8080
Oxrun\Command\Deploy\GenerateConfigurationCommand:
8181
tags:
82-
- { name: console.command }
82+
- { name: console.command, command: 'deploy:generate:configuration' }
8383
autowire: true
8484
Oxrun\Command\Deploy\ConfigCommand:
8585
tags:
86-
- { name: console.command }
86+
- { name: console.command, command: 'deploy:config' }
8787
autowire: true
8888
Oxrun\Command\Config\SetCommand:
8989
tags:
90-
- { name: console.command }
90+
- { name: console.command, command: 'config:set' }
9191
autowire: true
9292
Oxrun\Command\Deploy\LinkEnvironmentCommand:
9393
tags:
94-
- { name: console.command }
94+
- { name: console.command, command: 'deploy:link:environment' }
9595
autowire: true

src/Oxrun/Application/oxrun-light.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class OxrunLight extends \Symfony\Component\Console\Application
2020
/**
2121
* @inheritDoc
2222
*/
23-
public function getHelp()
23+
public function getHelp(): string
2424
{
2525
$version = parent::getHelp();
2626
return <<<TAG

0 commit comments

Comments
 (0)