Merge pull request #278 from symfony-cmf/issue-277/validation

Only register validation metadata when PHPCR is enabled, adjust file structure

Author: dbu

.styleci.yml

@@ -1 +1,2 @@
 preset: symfony
+disabled: [single_line_class_definition]

.travis.yml

@@ -10,20 +10,21 @@ sudo: false
 
 cache:
   directories:
+    - .phpunit
     - $HOME/.composer/cache/files
 
 env:
-  matrix: SYMFONY_VERSION=2.8.*
-  global: SYMFONY_DEPRECATIONS_HELPER=321
+  matrix: SYMFONY_VERSION=3.2.*
+  global: SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
   include:
-    - php: 7.0
-      env: DEPS=dev SYMFONY_VERSION=3.1.*
+    - php: 7.1
+      env: DEPS=dev SYMFONY_VERSION=3.3.*
     - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.6
-      env: DEPS=dev COMPOSER_FLAGS="--prefer-stable" SYMFONY_VERSION=3.0.*
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:

composer.json

@@ -33,7 +33,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Symfony\\Cmf\\Bundle\\MenuBundle\\": ""
+            "Symfony\\Cmf\\Bundle\\MenuBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Symfony\\Cmf\\Bundle\\MenuBundle\\Tests\\": "tests/"
         }
     },
     "extra": {

phpunit.xml.dist

@@ -8,23 +8,20 @@
 
     <testsuites>
         <testsuite name="Symfony CmfMenuBundle Test Suite">
-            <directory>./Tests/Unit</directory>
+            <directory>./tests/Unit</directory>
         </testsuite>
 
         <testsuite name="phpcr">
-            <directory>./Tests/Functional</directory>
+            <directory>./tests/Functional</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>.</directory>
+            <directory>src</directory>
             <exclude>
                 <file>*Bundle.php</file>
                 <directory>Resources/</directory>
-                <directory>Admin/</directory>
-                <directory>Tests/</directory>
-                <directory>vendor/</directory>
             </exclude>
         </whitelist>
     </filter>
@@ -34,7 +31,7 @@
     </listeners>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Resources/app" />
+        <server name="KERNEL_DIR" value="tests/Resources/app" />
     </php>
 
 </phpunit>

CmfMenuBundle.php renamed to src/CmfMenuBundle.php

@@ -14,6 +14,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\DecorateMenuFactoryPass;
+use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\ValidationPass;
 use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
 
 class CmfMenuBundle extends Bundle
@@ -23,6 +24,7 @@ public function build(ContainerBuilder $container)
         parent::build($container);
 
         $container->addCompilerPass(new DecorateMenuFactoryPass());
+        $container->addCompilerPass(new ValidationPass());
 
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {
             $container->addCompilerPass(

DependencyInjection/CmfMenuExtension.php renamed to src/DependencyInjection/CmfMenuExtension.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 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\MenuBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * Register validation files only if their persistence layer is enabled.
+ *
+ * @author Wouter de Jong <[email protected]>
+ */
+class ValidationPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->hasParameter('cmf_menu.persistence.phpcr.menu_document_class')) {
+            $container
+                ->getDefinition('validator.builder')
+                ->addMethodCall('addXmlMappings', [[__DIR__.'/../../Resources/config/validation-phpcr.xml']]);
+        }
+    }
+}