Skip to content

Allow add namespace to views #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Allow add namespace to views #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a2e921
Add view namespace
thewebartisan7 Aug 26, 2020
91f87b6
View namespace
thewebartisan7 Aug 26, 2020
cf9ad6f
Fix styles
thewebartisan7 Aug 26, 2020
d483a4f
Update ViewGenerator.php
thewebartisan7 Aug 26, 2020
e19c7ef
Small typo fix
thewebartisan7 Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/Common/GeneratorConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,11 @@ public function loadDynamicVariables(CommandData &$commandData)
}

if (!empty($this->prefixes['view'])) {
$commandData->addDynamicVariable('$VIEW_PREFIX$', str_replace('/', '.', $this->prefixes['view']).'.');
if (!empty($this->prefixes['view_namespace'])) {
$commandData->addDynamicVariable('$VIEW_PREFIX$', str_replace('/', '.', $this->prefixes['view_namespace'].'::'.$this->prefixes['view']).'.');
} else {
$commandData->addDynamicVariable('$VIEW_PREFIX$', str_replace('/', '.', $this->prefixes['view']).'.');
}
} else {
$commandData->addDynamicVariable('$VIEW_PREFIX$', '');
}
Expand Down Expand Up @@ -397,7 +401,19 @@ public function preparePrefixes()
{
$this->prefixes['route'] = explode('/', config('infyom.laravel_generator.prefixes.route', ''));
$this->prefixes['path'] = explode('/', config('infyom.laravel_generator.prefixes.path', ''));
$this->prefixes['view'] = explode('.', config('infyom.laravel_generator.prefixes.view', ''));

/**
* Check if exist view namespace when generate views path is inside a package.
*/
if (strpos(config('infyom.laravel_generator.prefixes.view', ''), '::') !== false) {
$viewNamespaced = explode('::', config('infyom.laravel_generator.prefixes.view', ''));
$this->prefixes['view_namespace'] = $viewNamespaced[0];
$this->prefixes['view'] = explode('.', $viewNamespaced[1]);
} else {
$this->prefixes['view_namespace'] = '';
$this->prefixes['view'] = explode('.', config('infyom.laravel_generator.prefixes.view', ''));
}

$this->prefixes['public'] = explode('/', config('infyom.laravel_generator.prefixes.public', ''));

if ($this->getOption('prefix')) {
Expand Down
10 changes: 9 additions & 1 deletion src/Generators/Scaffold/ViewGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,15 @@ private function generateFields()
}

$tableName = $this->commandData->config->tableName;
$viewPath = $this->commandData->config->prefixes['view'];

/**
* Add namespace to view.
*/
if (empty($this->commandData->config->prefixes['view_namespace'])) {
$viewPath = $this->commandData->config->prefixes['view'];
} else {
$viewPath = $this->commandData->config->prefixes['view_namespace'].'::'.$this->commandData->config->prefixes['view'];
}
if (!empty($viewPath)) {
$tableName = $viewPath.'.'.$tableName;
}
Expand Down