From 26cc962c07cfa197d8bfe16f874a336c3c65888b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 00:14:34 +0100 Subject: [PATCH 1/9] [FrameworkBundle] Fix frameworkextension test --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 452ea55e21e37..e930cf4b68306 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -548,7 +548,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format) { $versionStrategy = $container->getDefinition($reference); - if (null === $version) { + if (null === $version || !$versionStrategy instanceof DefinitionDecorator) { $this->assertEquals('assets.empty_version_strategy', (string) $reference); } else { $this->assertEquals('assets.static_version_strategy', $versionStrategy->getParent()); From 3ed3c4cf5578d30ba34d87fb0886793dcc189edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 00:28:54 +0100 Subject: [PATCH 2/9] [FrameworkBundle] Frameworkextension test fixed --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index e930cf4b68306..797e13deb8375 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -527,7 +527,7 @@ private function checkAssetsPackages(ContainerBuilder $container, $legacy = fals $package = $container->getDefinition($packages['bar']); $this->assertUrlPackage($container, $package, array('https://bar2.example.com'), $legacy ? null : 'SomeVersionScheme', $legacy ? '%%s?%%s' : '%%s?version=%%s'); - $this->assertEquals($legacy ? 'assets.empty_version_strategy' : 'assets._version__default', (string) $container->getDefinition('assets._package_bar')->getArgument(1)); + $this->assertEquals('assets.empty_version_strategy', (string) $container->getDefinition('assets._package_bar')->getArgument(1)); $this->assertEquals('assets.empty_version_strategy', (string) $container->getDefinition('assets._package_bar_null_version')->getArgument(1)); } From d9587b327e730d4ed4861212f3ff10f1838d9a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 01:22:53 +0100 Subject: [PATCH 3/9] [FrameworkBundle] Frameworkextension test fix --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 797e13deb8375..3e34ea8124966 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -518,6 +518,9 @@ private function checkAssetsPackages(ContainerBuilder $container, $legacy = fals $this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s'); } +// var_dump($packages['images']);die; + + $package = $container->getDefinition($packages['images']); $this->assertUrlPackage($container, $package, array('http://images1.example.com', 'http://images2.example.com'), '1.0.0', $legacy ? '%%s?%%s' : '%%s?version=%%s'); @@ -548,12 +551,12 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format) { $versionStrategy = $container->getDefinition($reference); - if (null === $version || !$versionStrategy instanceof DefinitionDecorator) { - $this->assertEquals('assets.empty_version_strategy', (string) $reference); - } else { + if ($version && $versionStrategy instanceof DefinitionDecorator) { $this->assertEquals('assets.static_version_strategy', $versionStrategy->getParent()); $this->assertEquals($version, $versionStrategy->getArgument(0)); $this->assertEquals($format, $versionStrategy->getArgument(1)); + } else { + $this->assertEquals('assets.empty_version_strategy', (string)$reference); } } } From b7376c0d126a73278287f92a638fa0b42ee08add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 01:24:04 +0100 Subject: [PATCH 4/9] [FrameworkBundle] Frameworkbundle test fix, remove dump --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 3e34ea8124966..9d40d8c15b2dc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -518,9 +518,6 @@ private function checkAssetsPackages(ContainerBuilder $container, $legacy = fals $this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s'); } -// var_dump($packages['images']);die; - - $package = $container->getDefinition($packages['images']); $this->assertUrlPackage($container, $package, array('http://images1.example.com', 'http://images2.example.com'), '1.0.0', $legacy ? '%%s?%%s' : '%%s?version=%%s'); From 5d83c542bbebfec4a4f433b86f64cfbe0039b239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 01:29:38 +0100 Subject: [PATCH 5/9] [FrameworkBundle] Move ::fragment.html.php to Resources/views dir --- .../Tests/Functional/app/Resources/{ => views}/fragment.html.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/{ => views}/fragment.html.php (100%) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/fragment.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/views/fragment.html.php similarity index 100% rename from src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/fragment.html.php rename to src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Resources/views/fragment.html.php From 8094d0a4d0f20039d2589bc861df8014fe2e2aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 03:52:08 +0100 Subject: [PATCH 6/9] [FrameworkBundle] fabbot.io fix --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 9d40d8c15b2dc..185ea0dda374c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -553,7 +553,7 @@ private function assertVersionStrategy(ContainerBuilder $container, Reference $r $this->assertEquals($version, $versionStrategy->getArgument(0)); $this->assertEquals($format, $versionStrategy->getArgument(1)); } else { - $this->assertEquals('assets.empty_version_strategy', (string)$reference); + $this->assertEquals('assets.empty_version_strategy', (string) $reference); } } } From d1f18720776082f4472122f8ba27558c8dce5593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 04:14:18 +0100 Subject: [PATCH 7/9] Fix: apcu_clear_cache() expects exactly 0 parameters --- .../ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php index 066068d88de23..512ff632a51db 100644 --- a/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/LegacyApcUniversalClassLoaderTest.php @@ -21,7 +21,7 @@ class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase protected function setUp() { if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { - apcu_clear_cache('user'); + apcu_clear_cache(); } else { $this->markTestSkipped('APC is not enabled.'); } @@ -30,7 +30,7 @@ protected function setUp() protected function tearDown() { if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) { - apcu_clear_cache('user'); + apcu_clear_cache(); } } From 10ab042a85f890ed3eca041ef4754b96dad6d096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Thu, 28 Jan 2016 20:57:55 +0100 Subject: [PATCH 8/9] [FrameworkBundle] Frameworkextension test fix --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 185ea0dda374c..f48f5d5857214 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -548,7 +548,7 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format) { $versionStrategy = $container->getDefinition($reference); - if ($version && $versionStrategy instanceof DefinitionDecorator) { + if ($versionStrategy instanceof DefinitionDecorator) { $this->assertEquals('assets.static_version_strategy', $versionStrategy->getParent()); $this->assertEquals($version, $versionStrategy->getArgument(0)); $this->assertEquals($format, $versionStrategy->getArgument(1)); From 3c3f8d26d60d4765de1f555c89c799cea0054394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=A1da=20J=C3=B3zsef?= Date: Sat, 30 Jan 2016 13:01:54 +0100 Subject: [PATCH 9/9] [FrameworkBundle] Test fix revert --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index f48f5d5857214..452ea55e21e37 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -527,7 +527,7 @@ private function checkAssetsPackages(ContainerBuilder $container, $legacy = fals $package = $container->getDefinition($packages['bar']); $this->assertUrlPackage($container, $package, array('https://bar2.example.com'), $legacy ? null : 'SomeVersionScheme', $legacy ? '%%s?%%s' : '%%s?version=%%s'); - $this->assertEquals('assets.empty_version_strategy', (string) $container->getDefinition('assets._package_bar')->getArgument(1)); + $this->assertEquals($legacy ? 'assets.empty_version_strategy' : 'assets._version__default', (string) $container->getDefinition('assets._package_bar')->getArgument(1)); $this->assertEquals('assets.empty_version_strategy', (string) $container->getDefinition('assets._package_bar_null_version')->getArgument(1)); } @@ -548,12 +548,12 @@ private function assertUrlPackage(ContainerBuilder $container, DefinitionDecorat private function assertVersionStrategy(ContainerBuilder $container, Reference $reference, $version, $format) { $versionStrategy = $container->getDefinition($reference); - if ($versionStrategy instanceof DefinitionDecorator) { + if (null === $version) { + $this->assertEquals('assets.empty_version_strategy', (string) $reference); + } else { $this->assertEquals('assets.static_version_strategy', $versionStrategy->getParent()); $this->assertEquals($version, $versionStrategy->getArgument(0)); $this->assertEquals($format, $versionStrategy->getArgument(1)); - } else { - $this->assertEquals('assets.empty_version_strategy', (string) $reference); } } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy