Merge pull request #54 from symfony-cmf/fix-xml-confg

fix xml configuration schema

Author: dbu

.gitignore

@@ -2,3 +2,4 @@ vendor
 composer.lock
 composer.phar
 Tests/Resources/app/cache
+Tests/Resources/app/logs

Resources/config/schema/treebrowser-1.0.xsd

@@ -8,6 +8,19 @@
     <xsd:element name="config" type="config" />
 
     <xsd:complexType name="config">
+        <xsd:sequence>
+            <xsd:element name="persistence" type="persistence" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="persistence">
+        <xsd:sequence>
+            <xsd:element name="phpcr" type="phpcr" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="phpcr">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="session-name" type="xsd:string" />
     </xsd:complexType>
 </xsd:schema>

Tests/Resources/Fixtures/config/config1.xml

@@ -0,0 +1,2 @@
+<config xmlns="http://cmf.symfony.com/schema/dic/treebrowser">
+</config>

Tests/Resources/Fixtures/config/config2.xml

@@ -0,0 +1,7 @@
+<config xmlns="http://cmf.symfony.com/schema/dic/treebrowser">
+    <persistence>
+        <phpcr
+                session-name="default"
+                />
+    </persistence>
+</config>

Tests/Unit/DependencyInjection/XmlSchemaTest.php

@@ -0,0 +1,28 @@
+<?php
+/*
+* This file is part of the Symfony CMF package.
+*
+* (c) 2011-2013 Symfony CMF
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+
+namespace Symfony\Cmf\Bundle\TreeBrowserBundle\Tests\Unit\DependencyInjection;
+
+use Symfony\Cmf\Component\Testing\Unit\XmlSchemaTestCase;
+
+class XmlSchemaTest extends XmlSchemaTestCase
+{
+    public function testSchema()
+    {
+        $xmlFiles = array_map(function ($file) {
+            return __DIR__.'/../../Resources/Fixtures/config/'.$file;
+        }, array(
+            'config1.xml',
+            'config2.xml',
+        ));
+
+        $this->assertSchemaAcceptsXml($xmlFiles, __DIR__.'/../../../Resources/config/schema/treebrowser-1.0.xsd');
+    }
+}

composer.json

@@ -18,7 +18,7 @@
         "friendsofsymfony/jsrouting-bundle": "~1.1"
     },
     "require-dev": {
-        "symfony-cmf/testing": "1.0.*"
+        "symfony-cmf/testing": "1.1.*"
     },
     "suggest": {
         "doctrine/phpcr-bundle": "1.0.*",