Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hjanuschka/assetic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: kmm
Choose a base ref
...
head repository: KroneMultimedia/assetic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: kmm
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 1, 2019

  1. sf43

    root committed Jun 1, 2019
    Copy the full SHA
    baf6b18 View commit details

Commits on Jun 12, 2019

  1. twig deprecations

    hjanuschka committed Jun 12, 2019
    Copy the full SHA
    d4fa5d1 View commit details
2 changes: 1 addition & 1 deletion src/Assetic/Extension/Twig/AsseticExtension.php
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
use Assetic\Factory\AssetFactory;
use Assetic\ValueSupplierInterface;

class AsseticExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
class AsseticExtension extends \Twig_Extension implements \Twig\Extension\GlobalsInterface
{
protected $factory;
protected $functions;
2 changes: 1 addition & 1 deletion src/Assetic/Extension/Twig/AsseticFilterNode.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Assetic\Extension\Twig;

class AsseticFilterNode extends \Twig_Node_Expression_Function
class AsseticFilterNode extends \Twig\Node\Expression\FunctionExpression
{
protected function compileCallable(\Twig_Compiler $compiler)
{
2 changes: 1 addition & 1 deletion src/Assetic/Extension/Twig/TwigFormulaLoader.php
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ public function __construct(\Twig_Environment $twig, LoggerInterface $logger = n
public function load(ResourceInterface $resource)
{
try {
$tokens = $this->twig->tokenize(new \Twig_Source($resource->getContent(), (string) $resource));
$tokens = $this->twig->tokenize(new \Twig\Source($resource->getContent(), (string) $resource));
$nodes = $this->twig->parse($tokens);
} catch (\Exception $e) {
if ($this->logger) {