Skip to content

Fixing some line lengths in config examples to avoid horizontal scrollin... #1767

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.

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

Merged
merged 1 commit into from
Oct 7, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion components/config/caching.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ the cache can tell if it is still fresh or that its contents should be regenerat
$resources = array();

foreach ($yamlUserFiles as $yamlUserFile) {
// see the previous article "Loading resources" to see where $delegatingLoader comes from
// see the previous article "Loading resources" to
// see where $delegatingLoader comes from
$delegatingLoader->load($yamlUserFile);
$resources[] = new FileResource($yamlUserFile);
}
Expand Down
5 changes: 4 additions & 1 deletion components/config/definition.rst
Original file line number Diff line number Diff line change
Expand Up @@ -439,5 +439,8 @@ Otherwise the result is a clean array of configuration values::

$processor = new Processor();
$configuration = new DatabaseConfiguration;
$processedConfiguration = $processor->processConfiguration($configuration, $configs);
$processedConfiguration = $processor->processConfiguration(
$configuration,
$configs)
;

5 changes: 4 additions & 1 deletion components/config/resources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ class, which allows for recursively importing other resources::

public function supports($resource, $type = null)
{
return is_string($resource) && 'yml' === pathinfo($resource, PATHINFO_EXTENSION);
return is_string($resource) && 'yml' === pathinfo(
$resource,
PATHINFO_EXTENSION
);
}
}

Expand Down