8000 Revert "failing tests" · symfony/symfony@7348993 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7348993

Browse files
IndraGunawanIndraGunawan
committed
Revert "failing tests"
This reverts commit ad4b87b.
1 parent 5506a64 commit 7348993

File tree

4 files changed

+62
-126
lines changed

4 files changed

+62
-126
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/cache.php

Lines changed: 60 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,65 @@
11
<?php
22

3-
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4-
5-
use Symfony\Component\Cache\Adapter\ChainAdapter;
6-
7-
return static function (ContainerConfigurator $container) {
8-
$services = $container->services()
9-
->defaults()
10-
->autowire(true)
11-
->autoconfigure(true)
12-
;
13-
14-
$services->set('chain_cache_custom_ns', ChainAdapter::class)
15-
->arg(0, ['cache.adapter.array', 'cache.adapter.filesystem'])
16-
->tag('cache.pool', ['namespace' => 'my-custom-ns']);
17-
18-
$container->extension('framework', [
19-
'annotations' => false,
20-
'http_method_override' => false,
21-
'handle_all_throwables' => true,
22-
'php_errors' => ['log' => true],
23-
'cache' => [
24-
'pools' => [
25-
'cache.foo' => [
26-
'adapter' => 'cache.adapter.apcu',
27-
'default_lifetime' => 30,
28-
],
29-
'cache.baz' => [
30-
'adapter' => 'cache.adapter.filesystem',
31-
'default_lifetime' => 7,
32-
],
33-
'cache.foobar' => [
34-
'adapter' => 'cache.adapter.psr6',
35-
'default_lifetime' => 10,
36-
'provider' => 'app.cache_pool',
37-
],
38-
'cache.def' => [
39-
'default_lifetime' => 'PT11S',
40-
],
41-
'cache.expr' => [
42-
'default_lifetime' => '13 seconds',
43-
],
44-
'cache.chain' => [
45-
'default_lifetime' => 12,
46-
'adapter' => [
47-
'cache.adapter.array',
48-
'cache.adapter.filesystem',
49-
'redis://foo' => 'cache.adapter.redis',
50-
],
51-
],
52-
'cache.custom_ns_chain' => [
53-
'default_lifetime' => 12,
54-
'adapters' => ['chain_cache_custom_ns'],
55-
],
56-
'cache.ccc' => [
57-
'adapter' => 'cache.adapter.array',
58-
'default_lifetime' => 410,
59-
'tags' => true,
60-
],
61-
'cache.redis_tag_aware.foo' => [
62-
'adapter' => 'cache.adapter.redis_tag_aware',
63-
],
64-
'cache.redis_tag_aware.foo2' => [
65-
'tags' => true,
66-
'adapter' => 'cache.adapter.redis_tag_aware',
67-
],
68-
'cache.redis_tag_aware.bar' => [
69-
'adapter' => 'cache.redis_tag_aware.foo',
70-
],
71-
'cache.redis_tag_aware.bar2' => [
72-
'tags' => true,
73-
'adapter' => 'cache.redis_tag_aware.foo',
74-
],
75-
'cache.redis_tag_aware.baz' => [
76-
'adapter' => 'cache.redis_tag_aware.foo2',
77-
],
78-
'cache.redis_tag_aware.baz2' => [
79-
'tags' => true,
80-
'adapter' => 'cache.redis_tag_aware.foo2',
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'cache' => [
9+
'pools' => [
10+
'cache.foo' => [
11+
'adapter' => 'cache.adapter.apcu',
12+
'default_lifetime' => 30,
13+
],
14+
'cache.baz' => [
15+
'adapter' => 'cache.adapter.filesystem',
16+
'default_lifetime' => 7,
17+
],
18+
'cache.foobar' => [
19+
'adapter' => 'cache.adapter.psr6',
20+
'default_lifetime' => 10,
21+
'provider' => 'app.cache_pool',
22+
],
23+
'cache.def' => [
24+
'default_lifetime' => 'PT11S',
25+
],
26+
'cache.expr' => [
27+
'default_lifetime' => '13 seconds',
28+
],
29+
'cache.chain' => [
30+
'default_lifetime' => 12,
31+
'adapter' => [
32+
'cache.adapter.array',
33+
'cache.adapter.filesystem',
34+
'redis://foo' => 'cache.adapter.redis',
8135
],
8236
],
37+
'cache.ccc' => [
38+
'adapter' => 'cache.adapter.array',
39+
'default_lifetime' => 410,
40+
'tags' => true,
41+
],
42+
'cache.redis_tag_aware.foo' => [
43+
'adapter' => 'cache.adapter.redis_tag_aware',
44+
],
45+
'cache.redis_tag_aware.foo2' => [
46+
'tags' => true,
47+
'adapter' => 'cache.adapter.redis_tag_aware',
48+
],
49+
'cache.redis_tag_aware.bar' => [
50+
'adapter' => 'cache.redis_tag_aware.foo',
51+
],
52+
'cache.redis_tag_aware.bar2' => [
53+
'tags' => true,
54+
'adapter' => 'cache.redis_tag_aware.foo',
55+
],
56+
'cache.redis_tag_aware.baz' => [
57+
'adapter' => 'cache.redis_tag_aware.foo2',
58+
],
59+
'cache.redis_tag_aware.baz2' => [
60+
'tags' => true,
61+
'adapter' => 'cache.redis_tag_aware.foo2',
62+
],
8363
],
84-
]);
85-
};
64+
],
65+
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/cache.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

8-
<services>
9-
<defaults autowire="true" autoconfigure="true"/>
10-
11-
<service id="chain_cache_custom_ns" class="Symfony\Component\Cache\Adapter\ChainAdapter">
12-
<argument type="collection">
13-
<argument type="service" id="cache.adapter.array"/>
14-
<argument type="service" id="cache.adapter.filesystem"/>
15-
</argument>
16-
<tag name="cache.pool" namespace="my-custom-ns" />
17-
</service>
18-
</services>
19-
208
<framework:config http-method-override="false" handle-all-throwables="true">
219
<framework:annotations enabled="false" />
2210
<framework:php-errors log="true" />
@@ -31,7 +19,6 @@
3119
<framework:adapter name="cache.adapter.filesystem" />
3220
<framework:adapter name="cache.adapter.redis" provider="redis://foo" />
3321
</framework:pool>
34-
<framework:pool name="cache.custom_ns_chain" adapter="chain_cache_custom_ns" default-lifetime="12" />
3522
<framework:pool name="cache.ccc" adapter="cache.adapter.array" default-lifetime="410" tags="true" />
3623
<framework:pool name="cache.redis_tag_aware.foo" adapter="cache.adapter.redis_tag_aware" />
3724
<framework:pool name="cache.redis_tag_aware.foo2" tags="true" adapter="cache.adapter.redis_tag_aware" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/cache.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
services:
2-
_defaults:
3-
autowire: true
4-
autoconfigure: true
5-
6-
chain_cache_custom_ns:
7-
class: Symfony\Component\Cache\Adapter\ChainAdapter
8-
arguments:
9-
- ['@cache.adapter.array', '@cache.adapter.filesystem']
10-
tags:
11-
- { name: cache.pool, namespace: 'my-custom-ns' }
12-
13-
141
framework:
152
annotations: false
163
http_method_override: false
@@ -39,9 +26,6 @@ framework:
3926
- cache.adapter.array
4027
- cache.adapter.filesystem
4128
- {name: cache.adapter.redis, provider: 'redis://foo'}
42-
cache.custom_ns_chain:
43-
default_lifetime: 12
44-
adapter: 'chain_cache_custom_ns'
4529
cache.ccc:
4630
adapter: cache.adapter.array
4731
default_lifetime: 410

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,6 @@ public function testCachePoolServices()
17741774
{
17751775
$container = $this->createContainerFromFile('cache', [], true, false);
17761776
$container->setParameter('cache.prefix.seed', 'test');
1777-
$container->addCompilerPass(new ResolveInstanceofConditionalsPass());
17781777
$container->addCompilerPass(new CachePoolPass());
17791778
$container->compile();
17801779

@@ -1785,7 +1784,9 @@ public function testCachePoolServices()
17851784
$this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.expr', 'cache.app', '13 seconds');
17861785

17871786
$chain = $container->getDefinition('cache.chain');
1787+
17881788
$this->assertSame(ChainAdapter::class, $chain->getClass());
1789+
17891790
$this->assertCount(2, $chain->getArguments());
17901791
$this->assertCount(3, $chain->getArguments()[0]);
17911792

@@ -1806,22 +1807,6 @@ public function testCachePoolServices()
18061807
];
18071808
$this->assertEquals($expected, $chain->getArguments());
18081809

1809-
$chainCustomNs = $container->getDefinition('cache.custom_ns_chain');
1810-
$this->assertCount(2, $chainCustomNs->getArguments());
1811-
$this->assertCount(2, $chainCustomNs->getArguments()['index_0']);
1812-
1813-
$expectedCustomNsChain = [
1814-
'index_0' => [
1815-
(new ChildDefinition('cache.adapter.array'))
1816-
->replaceArgument(0, 12),
1817-
(new ChildDefinition('cache.adapter.filesystem'))
1818-
->replaceArgument(0, 'my-custom-ns')
1819-
->replaceArgument(1, 12),
1820-
],
1821-
'index_1' => 12,
1822-
];
1823-
$this->assertEquals($expectedCustomNsChain, $chainCustomNs->getArguments());
1824-
18251810
// Test "tags: true" wrapping logic
18261811
$tagAwareDefinition = $container->getDefinition('cache.ccc');
18271812
$this->assertSame(TagAwareAdapter::class, $tagAwareDefinition->getClass());

0 commit comments

Comments
 (0)
0