8000 modify cacheWarmer to include files from config dir if they exist by pascalwacker · Pull Request #211 · msgphp/msgphp · GitHub
[go: up one dir, main page]
Skip to content

modify cacheWarmer to include files from config dir if they exist #211

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

Closed
wants to merge 3 commits into from
Closed

modify cacheWarmer to include files from config dir if they exist #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e60e6fb
modify cacheWarmer to include files from config dir if they exist
Oct 24, 2018
dff4beb
move config path to BundleHelper
Oct 24, 2018
d70239f
add config param for cache folder
Oct 24, 2018
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
1 change: 1 addition & 0 deletions src/Domain/Infra/DependencyInjection/BundleHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ private static function initDoctrineOrm(ContainerBuilder $container): void
->setPublic(false)
->setArgument('$dirName', 'msgphp/doctrine-mapping')
->setArgument('$mappingFiles', '%msgphp.doctrine.mapping_files%')
->setArgument('$configDir', '%msgphp.doctrine.config_folder%')
->addTag('kernel.cache_warmer', ['priority' => 100]);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/Domain/Infra/DependencyInjection/ExtensionHelper.php
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public static function configureDoctrineOrm(ContainerBuilder $container, array $

$container->setParameter($param = 'msgphp.doctrine.type_config', $container->hasParameter($param) ? $typeConfig + $container->getParameter($param) : $typeConfig);
$container->setParameter($param = 'msgphp.doctrine.mapping_files', $container->hasParameter($param) ? array_merge($container->getParameter($param), $mappingFiles) : $mappingFiles);
$container->setParameter($param = 'msgphp.doctrine.config_folder', $container->hasParameter($param) ? $container->getParameter($param) : $container->getParameter('kernel.project_dir') . '/config/packages/msgphp/doctrine');

$container->prependExtensionConfig('doctrine', [
'dbal' => [
Expand Down
12 changes: 10 additions & 2 deletions src/Domain/Infra/Doctrine/MappingCacheWarmer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ final class MappingCacheWarmer implements CacheWarmerInterface
{
private $dirName;
private $mappingFiles;
private $configDir;

public function __construct(string $dirName, array $mappingFiles)
public function __construct(string $dirName, array $mappingFiles, string $configDir = null)
{
$this->dirName = $dirName;
$this->mappingFiles = $mappingFiles;
$this->configDir = $configDir;
}

public function isOptional(): bool
Expand All @@ -34,7 +36,13 @@ public function warmUp($cacheDir): void
$filesystem->mkdir($target = $cacheDir.'/'.$this->dirName);

foreach ($this->mappingFiles as $file) {
$filesystem->copy($file, $target.'/'.basename($file));
$filename = basename($file);

if ($this->configDir && $filesystem->exists($this->configDir.'/'.$filename)) {
$filesystem->copy($this->configDir.'/'.$filename, $target.'/'.basename($file));
} else {
$filesystem->copy($file, $target.'/'.$filename);
}
}
}
}
0