Skip to content

Commit

Permalink
Make functions smaller / more concise
Browse files Browse the repository at this point in the history
  • Loading branch information
@iquito
iquito committed Apr 27, 2019
1 parent fcaee89 commit f606ea1
Showing 1 changed file with 66 additions and 66 deletions.
132 changes: 66 additions & 66 deletions src/DependencyInjection/SquirrelEntitiesExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,25 +126,8 @@ private function findAllEntityClassesInFilesystem(array $directories)

// Go through directories
foreach ($directories as $directory) {
// Find the files in the directory
$sourceFinder = new Finder();
$sourceFinder->in($directory)->files()->name('*.php');

// Go through files which were found
foreach ($sourceFinder as $file) {
// Safety check because Finder can return false if the file was not found
if ($file->getRealPath()===false) {
throw new \InvalidArgumentException('File in source directory not found');
}

// Get file contents
$fileContents = \file_get_contents($file->getRealPath());

// Another safety check because file_get_contents can return false if the file was not found
if ($fileContents===false) {
throw new \InvalidArgumentException('File in source directory could not be retrieved');
}

foreach ($this->findNextFileAndReturnContentsGenerator($directory) as $fileContents) {
// Get all possible entity classes with our annotation
$entityClasses = \array_merge(
$entityClasses,
Expand All @@ -156,15 +139,48 @@ private function findAllEntityClassesInFilesystem(array $directories)
return $entityClasses;
}

private function findNextFileAndReturnContentsGenerator($directory)
{
// Find the files in the directory
$sourceFinder = new Finder();
$sourceFinder->in($directory)->files()->name('*.php');

// Go through files which were found
foreach ($sourceFinder as $file) {
// Safety check because Finder can return false if the file was not found
if ($file->getRealPath()===false) {
throw new \InvalidArgumentException('File in source directory not found');
}

// Get file contents
$fileContents = \file_get_contents($file->getRealPath());

// Another safety check because file_get_contents can return false if the file was not found
if ($fileContents===false) {
throw new \InvalidArgumentException('File in source directory could not be retrieved');
}

// Return the file contents as a generator
yield $fileContents;
}
}

/**
* @param ContainerBuilder $container
* @param RepositoryConfig $repositoryConfig Configuration of repository according to annotations
* @param string|null $overrideConnectionName Connection name should be replaced by this configuration setting
* @param string|null $overrideTableName Table name should be replaced by this configuration setting
* @return string Connection name (as used when decorating the connection) for this entity
*/
private function createRepositoryServicesForEntity(
ContainerBuilder $container,
RepositoryConfig $repositoryConfig,
?string $customConnectionName,
?string $customTableName
): ?string {
?string $overrideConnectionName,
?string $overrideTableName
): string {
// Connection can be overwritten in configuration
$connectionName = isset($customConnectionName)
? $customConnectionName
$connectionName = isset($overrideConnectionName)
? $overrideConnectionName
: $repositoryConfig->getConnectionName();

// No ReadOnly repository - exit early
Expand All @@ -173,43 +189,35 @@ private function createRepositoryServicesForEntity(
}

// Table name can be overwritten in configuration
$tableName = isset($customTableName)
? $customTableName
$tableName = isset($overrideTableName)
? $overrideTableName
: $repositoryConfig->getTableName();

// Create repository config definition
$repositoryConfigDef = new Definition(
RepositoryConfig::class,
[
$connectionName,
$tableName,
$repositoryConfig->getTableToObjectFields(),
$repositoryConfig->getObjectToTableFields(),
$repositoryConfig->getObjectClass(),
$repositoryConfig->getObjectTypes(),
$repositoryConfig->getObjectTypesNullable(),
]
);
$repositoryConfigDef = new Definition(RepositoryConfig::class, [
$connectionName,
$tableName,
$repositoryConfig->getTableToObjectFields(),
$repositoryConfig->getObjectToTableFields(),
$repositoryConfig->getObjectClass(),
$repositoryConfig->getObjectTypes(),
$repositoryConfig->getObjectTypesNullable(),
]);

// Convention for squirrel connection services
$dbReference = 'squirrel.connection.' . $connectionName;

// No connection name set - use default class type hint
if (\strlen($connectionName) === 0) {
$dbReference = DBInterface::class;
}
$dbReference = ( \strlen($connectionName) === 0
? DBInterface::class // Default connection
: 'squirrel.connection.' . $connectionName // Specific connection
);

$container->setDefinition(
$repositoryConfig->getObjectClass() . 'RepositoryReadOnly',
new Definition(
$repositoryConfig->getObjectClass() . 'RepositoryReadOnly',
[
new Definition(RepositoryReadOnly::class, [
new Reference($dbReference),
$repositoryConfigDef,
]),
]
)
new Definition($repositoryConfig->getObjectClass() . 'RepositoryReadOnly', [
new Definition(RepositoryReadOnly::class, [
new Reference($dbReference),
$repositoryConfigDef,
]),
])
);

// No writeable repository exists
Expand All @@ -219,15 +227,12 @@ private function createRepositoryServicesForEntity(

$container->setDefinition(
$repositoryConfig->getObjectClass() . 'RepositoryWriteable',
new Definition(
$repositoryConfig->getObjectClass() . 'RepositoryWriteable',
[
new Definition(RepositoryWriteable::class, [
new Reference($dbReference),
$repositoryConfigDef,
]),
]
)
new Definition($repositoryConfig->getObjectClass() . 'RepositoryWriteable', [
new Definition(RepositoryWriteable::class, [
new Reference($dbReference),
$repositoryConfigDef,
]),
])
);

return $connectionName;
Expand All @@ -236,11 +241,6 @@ private function createRepositoryServicesForEntity(
private function createTransactionServices(ContainerBuilder $container, array $connectionNames)
{
foreach ($connectionNames as $connectionName) {
// Skip connections where no repositories were created
if (\is_null($connectionName)) {
continue;
}

// Default service name conventions
$serviceName = 'squirrel.transaction.' . $connectionName;
$connectionService = 'squirrel.connection.' . $connectionName;
Expand Down

0 comments on commit f606ea1

Please sign in to comment.