From 325dd85703e4d95292e69244839e7567b468c5ad Mon Sep 17 00:00:00 2001 From: David Sanchez Date: Sat, 29 Sep 2018 12:48:22 -0400 Subject: [PATCH 1/5] Replace method `getDefinition` by `findDefinition` --- DependencyInjection/Compiler/ThemeCompilerPass.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DependencyInjection/Compiler/ThemeCompilerPass.php b/DependencyInjection/Compiler/ThemeCompilerPass.php index a025656..e38c3c4 100644 --- a/DependencyInjection/Compiler/ThemeCompilerPass.php +++ b/DependencyInjection/Compiler/ThemeCompilerPass.php @@ -28,7 +28,7 @@ public function process(ContainerBuilder $container) ->replaceArgument(2, null); } - $twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.filesystem'); + $twigFilesystemLoaderDefinition = $container->findDefinition('twig.loader.filesystem'); $twigFilesystemLoaderDefinition->setClass($container->getParameter('liip_theme.filesystem_loader.class')); $twigFilesystemLoaderDefinition->addMethodCall('setActiveTheme', array(new Reference('liip_theme.active_theme'))); } From 7dce5188319331c40f21a8221882fef96f5d7b57 Mon Sep 17 00:00:00 2001 From: David Sanchez Date: Sat, 29 Sep 2018 18:13:55 -0400 Subject: [PATCH 2/5] Declare service locally `templating.filename_parser` to fix **non-existent service**. --- Resources/config/templating.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/config/templating.xml b/Resources/config/templating.xml index fb4bd8a..ca3bc66 100644 --- a/Resources/config/templating.xml +++ b/Resources/config/templating.xml @@ -15,6 +15,8 @@ + + From 7df3ab814cb4a94d487652cb9aa50caa5e1e4549 Mon Sep 17 00:00:00 2001 From: David Sanchez Date: Sat, 29 Sep 2018 18:17:27 -0400 Subject: [PATCH 3/5] Set missing arguments for class `\Liip\ThemeBundle\Twig\Loader\FilesystemLoader` --- DependencyInjection/Compiler/ThemeCompilerPass.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DependencyInjection/Compiler/ThemeCompilerPass.php b/DependencyInjection/Compiler/ThemeCompilerPass.php index e38c3c4..f99dce0 100644 --- a/DependencyInjection/Compiler/ThemeCompilerPass.php +++ b/DependencyInjection/Compiler/ThemeCompilerPass.php @@ -30,6 +30,10 @@ public function process(ContainerBuilder $container) $twigFilesystemLoaderDefinition = $container->findDefinition('twig.loader.filesystem'); $twigFilesystemLoaderDefinition->setClass($container->getParameter('liip_theme.filesystem_loader.class')); + $twigFilesystemLoaderDefinition->setArguments(array( + $container->getDefinition('liip_theme.templating_locator'), + $container->getDefinition('templating.filename_parser') + )); $twigFilesystemLoaderDefinition->addMethodCall('setActiveTheme', array(new Reference('liip_theme.active_theme'))); } } From 47cb08ec63d2cf2b5f27767fc6fa890bd6eee1fb Mon Sep 17 00:00:00 2001 From: David Sanchez Date: Thu, 4 Oct 2018 10:59:12 -0400 Subject: [PATCH 4/5] Fixing tests, method `getDefinition` changed to `findDefinition` --- Tests/DependencyInjection/Compiler/ThemeCompilerPassTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/DependencyInjection/Compiler/ThemeCompilerPassTest.php b/Tests/DependencyInjection/Compiler/ThemeCompilerPassTest.php index 72e5701..121dc89 100644 --- a/Tests/DependencyInjection/Compiler/ThemeCompilerPassTest.php +++ b/Tests/DependencyInjection/Compiler/ThemeCompilerPassTest.php @@ -31,7 +31,7 @@ public function testProcess() ; $containerMock->expects($this->once()) - ->method('getDefinition') + ->method('findDefinition') ->with('twig.loader.filesystem') ->willReturn( $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition') From abef6c2c755daae02869bb88de8d60ed84dee7bf Mon Sep 17 00:00:00 2001 From: David Sanchez Date: Thu, 4 Oct 2018 13:43:19 -0400 Subject: [PATCH 5/5] Trying to fix error in PHP5.6 by increasing PHP memory limit to unlimited: `-1` --- .travis.yml | 1 + travis.php.ini | 1 + 2 files changed, 2 insertions(+) create mode 100644 travis.php.ini diff --git a/.travis.yml b/.travis.yml index adbbbec..aa13365 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ matrix: env: SYMFONY_VERSION=@dev;ASSETIC=skip before_install: + - if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then phpenv config-add travis.php.ini; fi - if [[ $TRAVIS_PHP_VERSION != '7.0' && $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != '7.2' ]]; then phpenv config-rm xdebug.ini; fi - composer self-update - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi; diff --git a/travis.php.ini b/travis.php.ini new file mode 100644 index 0000000..495b35c --- /dev/null +++ b/travis.php.ini @@ -0,0 +1 @@ +memory_limit = -1 \ No newline at end of file