Skip to content
Snippets Groups Projects

Resolve "Refactor ServiceModule::checkComponents()"

Merged Stein Magne Bjorklund requested to merge 20-refactor-servicemodule-checkcomponents into master
1 file
+ 14
14
Compare changes
  • Side-by-side
  • Inline
@@ -45,19 +45,19 @@ final class ServiceModule implements ModuleInterface
*/
private function checkComponents($serviceName, $arguments, $extension, $conf, $lodspk): array
{
$componentPrefix = $conf['model']['directory'] . '/' . $conf['service']['prefix'];
$viewComponent = $conf['view']['directory'] . '/' . $conf['service']['prefix'] . '/' . $serviceName . '/';
$modelDirectory = $conf['model']['directory'] . '/' . $conf['service']['prefix'];
$viewDirectory = $conf['view']['directory'] . '/' . $conf['service']['prefix'] . '/' . $serviceName . '/';
if ($this->scaffoldExist($conf, $serviceName)) {
$subDir = $this->readScaffold(
$componentPrefix . '/' . $serviceName . '/scaffold.ttl',
$modelDirectory . '/' . $serviceName . '/scaffold.ttl',
implode('/', $arguments)
) . '/';
$lodspk['model'] = $conf['home'] . $componentPrefix . '/' . $serviceName . '/' . $subDir;
$lodspk['view'] = $viewComponent . $subDir . $extension . '.template';
} elseif (file_exists($conf['home'] . $componentPrefix . '/' . $serviceName)) {
$lodspk['model'] = $conf['home'] . $componentPrefix . '/' . $serviceName . '/';
$lodspk['view'] = $conf['home'] . $viewComponent . $extension . '.template';
$lodspk['model'] = $conf['home'] . $modelDirectory . '/' . $serviceName . '/' . $subDir;
$lodspk['view'] = $viewDirectory . $subDir . $extension . '.template';
} elseif (file_exists($conf['home'] . $modelDirectory . '/' . $serviceName)) {
$lodspk['model'] = $conf['home'] . $modelDirectory . '/' . $serviceName . '/';
$lodspk['view'] = $conf['home'] . $viewDirectory . $extension . '.template';
} elseif (is_null($lodspk['model']) && is_null($lodspk['view'])) {
// Checking other components.
if (!empty($conf['components']['services']) && count($conf['components']['services']) > 0) {
@@ -72,16 +72,16 @@ final class ServiceModule implements ModuleInterface
if ($this->scaffoldExist($conf, $serviceName)) {
$subDir = $this->readScaffold(
$componentPrefix . '/' . $serviceName . '/scaffold.ttl',
$modelDirectory . '/' . $serviceName . '/scaffold.ttl',
implode('/', $arguments)
) . '/';
$lodspk['model'] = $componentPrefix . '/' . $serviceName . '/' . $subDir;
$lodspk['view'] = $viewComponent . $subDir . $extension . '.template';
$lodspk['model'] = $modelDirectory . '/' . $serviceName . '/' . $subDir;
$lodspk['view'] = $viewDirectory . $subDir . $extension . '.template';
} elseif (file_exists(
$componentPrefix . '/' . $serviceName
$modelDirectory . '/' . $serviceName
)) {
$lodspk['model'] = $componentPrefix . '/' . $serviceName . '/';
$lodspk['view'] = $viewComponent . $extension . '.template';
$lodspk['model'] = $modelDirectory . '/' . $serviceName . '/';
$lodspk['view'] = $viewDirectory . $extension . '.template';
}
}
}
Loading