mirror of
https://github.com/hauke68/Magallanes.git
synced 2025-09-16 13:50:17 +02:00
Fix conflicts after merge
This commit is contained in:
parent
5db9905ed4
commit
8a5f0ee23e
@ -21,13 +21,6 @@ use Mage\Compiler;
|
|||||||
*/
|
*/
|
||||||
class CompileCommand extends AbstractCommand
|
class CompileCommand extends AbstractCommand
|
||||||
{
|
{
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
$this->setName('Compile command')
|
|
||||||
->setHelpMessage('Compiles Magallanes to mage.phar file')
|
|
||||||
->setSyntaxMessage('mage compile');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var Compiler
|
* @var Compiler
|
||||||
*/
|
*/
|
||||||
@ -40,6 +33,10 @@ class CompileCommand extends AbstractCommand
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->compiler = $compiler;
|
$this->compiler = $compiler;
|
||||||
|
|
||||||
|
$this->setName('Compile command')
|
||||||
|
->setHelpMessage('Compiles Magallanes to mage.phar file')
|
||||||
|
->setSyntaxMessage('mage compile');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user