1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
Date: Sat, 24 Jan 2015 17:56:51 -0400
Subject: Adapt data path
The package currently installs them in a PEAR-like path.
Forwarded: not-needed
---
src/main/php/PDepend/Application.php | 2 +-
src/main/php/PDepend/DependencyInjection/PdependExtension.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/php/PDepend/Application.php b/src/main/php/PDepend/Application.php
index 91e9e24..be11479 100644
--- a/src/main/php/PDepend/Application.php
+++ b/src/main/php/PDepend/Application.php
@@ -151,7 +151,7 @@ class Application
$container->prependExtensionConfig('pdepend', array());
$container->addCompilerPass(new DependencyInjection\Compiler\ProcessListenerPass());
- $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../resources'));
+ $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../data/PDepend/resources'));
foreach ($extensions as $extension) {
$container->registerExtension($extension);
diff --git a/src/main/php/PDepend/DependencyInjection/PdependExtension.php b/src/main/php/PDepend/DependencyInjection/PdependExtension.php
index 96dfac4..7dd9784 100644
--- a/src/main/php/PDepend/DependencyInjection/PdependExtension.php
+++ b/src/main/php/PDepend/DependencyInjection/PdependExtension.php
@@ -84,7 +84,7 @@ class PdependExtension extends SymfonyExtension
$configuration = new Configuration($extensionManager->getActivatedExtensions());
$config = $this->processConfiguration($configuration, $configs);
- $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../resources'));
+ $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../../data/PDepend/resources'));
$loader->load('services.xml');
foreach ($extensionManager->getActivatedExtensions() as $extension) {
|