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

Fix #1260 : Prefix plugin twig namespace with "plugin-"

Browse Source
This commit is contained in:
Romain Neutron
2013-07-09 15:26:17 +02:00
parent 1dbb225696
commit b099e42012
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Plugin/Management/AutoloaderGenerator.php
View File

@@ -153,13 +153,13 @@ return array(
EOF; EOF;
foreach ($manifests as $manifest) { foreach ($manifests as $manifest) {
$name = $this->quote($manifest->getName()); $namespace = $this->quote('plugin-' . $manifest->getName());
$path = $this->pluginDirectory . DIRECTORY_SEPARATOR . $manifest->getName() . DIRECTORY_SEPARATOR . 'views'; $path = $this->pluginDirectory . DIRECTORY_SEPARATOR . $manifest->getName() . DIRECTORY_SEPARATOR . 'views';
if (is_dir($path)) { if (is_dir($path)) {
$path = $this->quote($path); $path = $this->quote($path);
$buffer .= <<<EOF $buffer .= <<<EOF
$name => $path, $namespace => $path,
EOF; EOF;
} }

2
tests/Alchemy/Tests/Phrasea/Plugin/Management/AutoloaderGeneratorTest.php
View File

@@ -63,7 +63,7 @@ class AutoloaderGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Vendor\CustomCommand', $cli['console']->find('hello:world')); $this->assertInstanceOf('Vendor\CustomCommand', $cli['console']->find('hello:world'));
$mapping = require $pluginsDir . '/twig-paths.php'; $mapping = require $pluginsDir . '/twig-paths.php';
$this->assertSame(array('TestPlugin' => $pluginsDir . '/TestPlugin/views', $pluginsDir . '/TestPlugin/views', $pluginsDir . '/TestPlugin/twig-views'), $mapping); $this->assertSame(array('plugin-TestPlugin' => $pluginsDir . '/TestPlugin/views', $pluginsDir . '/TestPlugin/views', $pluginsDir . '/TestPlugin/twig-views'), $mapping);
$this->cleanup($files); $this->cleanup($files);
} }