Skip to content
This repository has been archived by the owner on Jan 1, 2023. It is now read-only.

updated to work with twig formula loader changes #142

Closed
wants to merge 7 commits into from
Closed

updated to work with twig formula loader changes #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df61637
updated to work with twig formula loader changes
kriswallsmith Dec 12, 2012
344ad10
cleaned up cleanup
kriswallsmith Dec 12, 2012
2401979
Merge remote-tracking branch 'origin/master' into node-visitor
kriswallsmith Dec 14, 2012
2facd37
Merge remote-tracking branch 'origin/master' into node-visitor
kriswallsmith Jan 8, 2013
b79085e
Merge remote-tracking branch 'origin/master' into node-visitor
kriswallsmith Jan 8, 2013
955b55d
Merge remote-tracking branch 'origin/master' into node-visitor
kriswallsmith Jan 9, 2013
0ea06d6
Merge remote-tracking branch 'origin/master' into node-visitor
kriswallsmith Jan 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion Resources/config/assetic.xml
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@
<parameter key="assetic.asset_factory.class">Symfony\Bundle\AsseticBundle\Factory\AssetFactory</parameter> <parameter key="assetic.asset_factory.class">Symfony\Bundle\AsseticBundle\Factory\AssetFactory</parameter>
<parameter key="assetic.asset_manager.class">Assetic\Factory\LazyAssetManager</parameter> <parameter key="assetic.asset_manager.class">Assetic\Factory\LazyAssetManager</parameter>
<parameter key="assetic.asset_manager_cache_warmer.class">Symfony\Bundle\AsseticBundle\CacheWarmer\AssetManagerCacheWarmer</parameter> <parameter key="assetic.asset_manager_cache_warmer.class">Symfony\Bundle\AsseticBundle\CacheWarmer\AssetManagerCacheWarmer</parameter>
<parameter key="assetic.cached_formula_loader.class">Assetic\Factory\Loader\CachedFormulaLoader</parameter>
<parameter key="assetic.config_cache.class">Assetic\Cache\ConfigCache</parameter> <parameter key="assetic.config_cache.class">Assetic\Cache\ConfigCache</parameter>
<parameter key="assetic.config_loader.class">Symfony\Bundle\AsseticBundle\Factory\Loader\ConfigurationLoader</parameter> <parameter key="assetic.config_loader.class">Symfony\Bundle\AsseticBundle\Factory\Loader\ConfigurationLoader</parameter>
<parameter key="assetic.config_resource.class">Symfony\Bundle\AsseticBundle\Factory\Resource\ConfigurationResource</parameter> <parameter key="assetic.config_resource.class">Symfony\Bundle\AsseticBundle\Factory\Resource\ConfigurationResource</parameter>
Expand Down
1 change: 1 addition & 0 deletions Resources/config/templating_php.xml
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
<parameter key="assetic.helper.dynamic.class">Symfony\Bundle\AsseticBundle\Templating\DynamicAsseticHelper</parameter> <parameter key="assetic.helper.dynamic.class">Symfony\Bundle\AsseticBundle\Templating\DynamicAsseticHelper</parameter>
<parameter key="assetic.helper.static.class">Symfony\Bundle\AsseticBundle\Templating\StaticAsseticHelper</parameter> <parameter key="assetic.helper.static.class">Symfony\Bundle\AsseticBundle\Templating\StaticAsseticHelper</parameter>
<parameter key="assetic.php_formula_loader.class">Symfony\Bundle\AsseticBundle\Factory\Loader\AsseticHelperFormulaLoader</parameter> <parameter key="assetic.php_formula_loader.class">Symfony\Bundle\AsseticBundle\Factory\Loader\AsseticHelperFormulaLoader</parameter>
<parameter key="assetic.cached_formula_loader.class">Assetic\Factory\Loader\CachedFormulaLoader</parameter>
</parameters> </parameters>


<services> <services>
Expand Down
9 changes: 2 additions & 7 deletions Resources/config/templating_twig.xml
View file
Open in desktop
Expand Up @@ -14,20 +14,15 @@
<tag name="twig.extension" /> <tag name="twig.extension" />
<tag name="assetic.templating.twig" /> <tag name="assetic.templating.twig" />
<argument type="service" id="assetic.asset_factory" /> <argument type="service" id="assetic.asset_factory" />
<argument type="service" id="assetic.config_cache" />
<argument type="service" id="templating.name_parser" /> <argument type="service" id="templating.name_parser" />
<argument>%assetic.use_controller%</argument> <argument>%assetic.use_controller%</argument>
<argument>%assetic.twig_extension.functions%</argument> <argument>%assetic.twig_extension.functions%</argument>
<argument>%assetic.bundles%</argument> <argument>%assetic.bundles%</argument>
<argument type="service" id="assetic.value_supplier" on-invalid="null" /> <argument type="service" id="assetic.value_supplier" on-invalid="null" />
</service> </service>
<service id="assetic.twig_formula_loader" class="%assetic.cached_formula_loader.class%" public="false"> <service id="assetic.twig_formula_loader" class="%assetic.twig_formula_loader.class%" public="false">
<tag name="assetic.formula_loader" alias="twig" /> <tag name="assetic.formula_loader" alias="twig" />
<tag name="assetic.templating.twig" />
<argument type="service" id="assetic.twig_formula_loader.real" />
<argument type="service" id="assetic.config_cache" />
<argument>%kernel.debug%</argument>
</service>
<service id="assetic.twig_formula_loader.real" class="%assetic.twig_formula_loader.class%" public="false">
<tag name="assetic.templating.twig" /> <tag name="assetic.templating.twig" />
<argument type="service" id="twig" /> <argument type="service" id="twig" />
</service> </service>
Expand Down
18 changes: 9 additions & 9 deletions Tests/FunctionalTest.php
View file
Open in desktop
Expand Up @@ -20,27 +20,27 @@
*/ */
class FunctionalTest extends \PHPUnit_Framework_TestCase class FunctionalTest extends \PHPUnit_Framework_TestCase
{ {
protected $cacheDir; static protected $cacheDir;


protected function setUp() static public function setUpBeforeClass()
{ {
if (!class_exists('Assetic\\AssetManager')) { if (!class_exists('Assetic\\AssetManager')) {
$this->markTestSkipped('Assetic is not available.'); self::markTestSkipped('Assetic is not available.');
} }


$this->cacheDir = __DIR__.'/Resources/cache'; self::$cacheDir = __DIR__.'/Resources/cache';
if (file_exists($this->cacheDir)) { if (file_exists(self::$cacheDir)) {
$filesystem = new Filesystem(); $filesystem = new Filesystem();
$filesystem->remove($this->cacheDir); $filesystem->remove(self::$cacheDir);
} }


mkdir($this->cacheDir, 0777, true); mkdir(self::$cacheDir, 0777, true);
} }


protected function tearDown() static public function tearDownAfterClass()
{ {
$filesystem = new Filesystem(); $filesystem = new Filesystem();
$filesystem->remove($this->cacheDir); $filesystem->remove(self::$cacheDir);
} }


public function testTwigRenderDebug() public function testTwigRenderDebug()
Expand Down
11 changes: 6 additions & 5 deletions Twig/AsseticExtension.php
View file
Open in desktop
Expand Up @@ -11,9 +11,10 @@


namespace Symfony\Bundle\AsseticBundle\Twig; namespace Symfony\Bundle\AsseticBundle\Twig;


use Assetic\ValueSupplierInterface; use Assetic\Cache\ConfigCache;
use Assetic\Extension\Twig\AsseticExtension as BaseAsseticExtension; use Assetic\Extension\Twig\AsseticExtension as BaseAsseticExtension;
use Assetic\Factory\AssetFactory; use Assetic\Factory\AssetFactory;
use Assetic\ValueSupplierInterface;
use Symfony\Component\Templating\TemplateNameParserInterface; use Symfony\Component\Templating\TemplateNameParserInterface;


/** /**
Expand All @@ -27,9 +28,9 @@ class AsseticExtension extends BaseAsseticExtension
private $templateNameParser; private $templateNameParser;
private $enabledBundles; private $enabledBundles;


public function __construct(AssetFactory $factory, TemplateNameParserInterface $templateNameParser, $useController = false, $functions = array(), $enabledBundles = array(), ValueSupplierInterface $valueSupplier = null) public function __construct(AssetFactory $factory, ConfigCache $cache, TemplateNameParserInterface $templateNameParser, $useController = false, $functions = array(), $enabledBundles = array(), ValueSupplierInterface $valueSupplier = null)
{ {
parent::__construct($factory, $functions, $valueSupplier); parent::__construct($factory, $cache, $functions, $valueSupplier);


$this->useController = $useController; $this->useController = $useController;
$this->templateNameParser = $templateNameParser; $this->templateNameParser = $templateNameParser;
Expand All @@ -47,9 +48,9 @@ public function getTokenParsers()


public function getNodeVisitors() public function getNodeVisitors()
{ {
return array( return array_merge(parent::getNodeVisitors(), array(
new AsseticNodeVisitor($this->templateNameParser, $this->enabledBundles), new AsseticNodeVisitor($this->templateNameParser, $this->enabledBundles),
); ));
} }


public function getGlobals() public function getGlobals()
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
"symfony/framework-bundle": ">=2.1.0,<2.3-dev", "symfony/framework-bundle": ">=2.1.0,<2.3-dev",
"kriswallsmith/assetic": "1.1.*" "kriswallsmith/assetic": "dev-node-visitor"
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be reverted before the merge (btw, should we release 1.1 first and bump Assetic to 1.2 with these changes ?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What stability is 1.1 at?

Copy link
Member

Choose a reason for hiding this comment

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

currently, we only have alpha releases for 1.1 (but doing a stable release would be a great idea)

Copy link
Member

Choose a reason for hiding this comment

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

thus, changing the signature of the Twig extension is a BC break for everyone using Assetic and Twig standalone so I don't really like doing this before the 1.1 release

}, },
"require-dev": { "require-dev": {
"symfony/twig-bundle": ">=2.1.0,<2.3-dev", "symfony/twig-bundle": ">=2.1.0,<2.3-dev",
Expand Down