Skip to content

[assets] bundle package #10973

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 2 commits into from
Closed

[assets] bundle package #10973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec37fd
bundle package
May 23, 2014
426e81e
fix tests
ivan1986 May 25, 2014
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
17 changes: 17 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,11 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
$container->setDefinition('templating.asset.package.'.$name, $namedPackage);
$namedPackages[$name] = new Reference('templating.asset.package.'.$name);
}
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {
$bundlePackage = $this->createPackageDefinition($container, $config['assets_base_urls']['http'], $config['assets_base_urls']['ssl'], $config['assets_version'], $config['assets_version_format'], 'bundle.'.$bundle);
$container->setDefinition('templating.asset.package.bundle.'.$bundle, $bundlePackage);
$namedPackages[$bundle] = new Reference('templating.asset.package.bundle.'.$bundle);
}
$container->getDefinition('templating.helper.assets')->setArguments(array(
new Reference('templating.asset.default_package'),
$namedPackages,
Expand Down Expand Up @@ -528,6 +533,18 @@ function ($v, Reference $ref) use ($container) {
*/
private function createPackageDefinition(ContainerBuilder $container, array $httpUrls, array $sslUrls, $version, $format, $name = null)
{
if (strpos($name, 'bundle.') === 0) {
$package = new DefinitionDecorator('templating.asset.bundle_package');
$package
->setPublic(false)
->setScope('request')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The request-scope is deprecated as of 2.4 (or 2.3 not sure which one), use the RequestStack instead.

->replaceArgument(1, substr($name, 7))
->replaceArgument(2, $version)
->replaceArgument(3, $format)
;

return $package;
}
if (!$httpUrls) {
$package = new DefinitionDecorator('templating.asset.path_package');
$package
Expand Down
8 changes: 8 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<parameter key="templating.form.renderer.class">Symfony\Component\Form\FormRenderer</parameter>
<parameter key="templating.globals.class">Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables</parameter>
<parameter key="templating.asset.path_package.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PathPackage</parameter>
<parameter key="templating.asset.bundle_package.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\BundlePackage</parameter>
<parameter key="templating.asset.url_package.class">Symfony\Component\Templating\Asset\UrlPackage</parameter>
<parameter key="templating.asset.package_factory.class">Symfony\Bundle\FrameworkBundle\Templating\Asset\PackageFactory</parameter>
</parameters>
Expand Down Expand Up @@ -49,6 +50,13 @@
<argument /> <!-- version format -->
</service>

<service id="templating.asset.bundle_package" class="%templating.asset.bundle_package.class%" abstract="true">
<argument type="service" id="request" />
<argument /> <!-- bundle name -->
<argument /> <!-- version -->
<argument /> <!-- version format -->
</service>

<service id="templating.asset.url_package" class="%templating.asset.url_package.class%" abstract="true">
<argument /> <!-- base urls -->
<argument /> <!-- version -->
Expand Down
25 changes: 25 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Templating/Asset/BundlePackage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace Symfony\Bundle\FrameworkBundle\Templating\Asset;

use Symfony\Component\HttpFoundation\Request;

class BundlePackage extends PathPackage
{
private $bundleDir;

public function __construct(Request $request, $bundleName = null, $version = null, $format = null)
{
parent::__construct($request, $version, $format);
$this->bundleDir = 'bundles/' . strtolower(str_replace('Bundle', '', $bundleName));
}

public function getUrl($path, $version = null)
{
if (isset($this->bundleDir))
$path = $this->bundleDir . '/' . ltrim($path, '/');

return parent::getUrl($path, $version);
}

}
7 changes: 0 additions & 7 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,6 @@ public function testTemplating()
$this->assertEquals(array('FrameworkBundle:Form', 'theme1', 'theme2'), $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
}

public function testTemplatingAssetsHelperScopeDependsOnPackageArgumentScopes()
{
$container = $this->createContainerFromFile('templating_url_package');

$this->assertNotEquals('request', $container->getDefinition('templating.helper.assets')->getScope(), '->registerTemplatingConfiguration() does not set request scope on assets helper if no packages are request-scoped');
}

public function testTranslator()
{
$container = $this->createContainerFromFile('full');
Expand Down