10000 Merge branch '4.4' into 5.4 · symfony/symfony@1065c9d · GitHub
[go: up one dir, main page]

Skip to content

Commit 1065c9d

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: [Console] Escape % in command name & description from getDefault*() [FrameworkBundle] Fix XML cache config
2 parents ce8e5b7 + 19bd831 commit 1065c9d

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,14 @@
292292
<xsd:element name="default-pdo-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
293293
<xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
294294
</xsd:sequence>
295-
295+
<xsd:attribute name="app" type="xsd:string" />
296+
<xsd:attribute name="system" type="xsd:string" />
297+
<xsd:attribute name="directory" type="xsd:string" />
298+
<xsd:attribute name="default-doctrine-provider" type="xsd:string" />
299+
<xsd:attribute name="default-psr6-provider" type="xsd:string" />
300+
<xsd:attribute name="default-redis-provider" type="xsd:string" />
301+
<xsd:attribute name="default-memcached-provider" type="xsd:string" />
302+
<xsd:attribute name="default-pdo-provider" type="xsd:string" />
296303
<xsd:attribute name="prefix-seed" type="xsd:string" />
297304
</xsd:complexType>
298305

0 commit comments

Comments
 (0)
0