hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify builder service

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-07-10 11:51:23 +02:00
parent 648ed30bb9
commit c83f146a20
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Alchemy/Phrasea/Command/Developer/LessCompiler.php
View File

@@ -12,6 +12,7 @@
namespace Alchemy\Phrasea\Command\Developer;
use Alchemy\Phrasea\Command\Command;
use Alchemy\Phrasea\Exception\RuntimeException;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -51,10 +52,10 @@ class LessCompiler extends Command
$output->writeln('Building Assets...');
$errors = $this->container['phraseanet.less-builder']->build($files);
if (count($errors) > 0) {
$output->writeln(sprintf('<error>Errors occured during the build %s</error>', implode(', ', $errors)));
try {
$this->container['phraseanet.less-builder']->build($files);
} catch (RuntimeException $e) {
$output->writeln(sprintf('<error>Could not build less files %s</error>', implode(', ', $e->getMessage())));
return 1;
}

9
lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php
View File

@@ -44,11 +44,12 @@ abstract class AbstractPluginCommand extends Command
);
$output->write('Building Assets...');
$errors = $this->container['phraseanet.less-builder']->build($files);
if (count($errors) > 0) {
$output->writeln(sprintf('<error>Error(s) occured during the build %s</error>', implode(', ', $errors)));
try {
$this->container['phraseanet.less-builder']->build($files);
$output->writeln(" <comment>OK</comment>");
} catch (RuntimeException $e) {
$output->writeln(sprintf('<error>Could not build less files %s</error>', implode(', ', $e->getMessage())));
}
$output->writeln(" <comment>OK</comment>");
}
}

13
lib/Alchemy/Phrasea/Utilities/Less/Builder.php
View File

@@ -38,20 +38,9 @@ class Builder
*/
public function build($files)
{
$failures = 0;
$errors = array();
foreach ($files as $lessFile => $target) {
$this->filesystem->mkdir(dirname($target));
try {
$this->compiler->compile($target, $lessFile);
} catch (\Exception $e) {
$failures++;
$errors[] = $e->getMessage();
}
$this->compiler->compile($target, $lessFile);
}
return $errors;
}
}

8
lib/Alchemy/Phrasea/Utilities/Less/Compiler.php
View File

@@ -36,6 +36,14 @@ class Compiler
return new self($app['filesystem'], RecessDriver::create($binaries));
}
/**
* Compile LESS files
*
* @param string $target
* @param string $files
*
* @throws RuntimeException
*/
public function compile($target, $files)
{
$this->filesystem->mkdir(dirname($target));

4
tests/Alchemy/Tests/Phrasea/Utilities/Less/BuilderTest.php
View File

@@ -27,8 +27,6 @@ class BuilderTest extends \PHPUnit_Framework_TestCase
$builder = new Builder($compiler, $filesystem);
$build = $builder->build(array( __FILE__ => __DIR__ . '/output.css'));
$this->assertTrue($build);
$builder->build(array( __FILE__ => __DIR__ . '/output.css'));
}
}