Merge pull request #43 from symfony-cmf/issue-35/use-description

Use resource description and remove enhancer feature

Author: wouterj

src/CmfResourceRestBundle.php

@@ -12,14 +12,7 @@
 namespace Symfony\Cmf\Bundle\ResourceRestBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Cmf\Bundle\ResourceRestBundle\DependencyInjection\Compiler\EnhancerPass;
 
 class CmfResourceRestBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
-    {
-        $container->addCompilerPass(new EnhancerPass());
-        parent::build($container);
-    }
 }

src/DependencyInjection/CmfResourceRestExtension.php

@@ -20,11 +20,6 @@
 
 class CmfResourceRestExtension extends Extension
 {
-    private $nativeEnhancers = array(
-        'payload',
-        'sonata_admin',
-    );
-
     /**
      * {@inheritdoc}
      */
@@ -41,13 +36,12 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $container->setParameter('cmf_resource_rest.max_depth', $config['max_depth']);
+        $container->setParameter('cmf_resource_rest.expose_payload', $config['expose_payload']);
 
         $loader->load('serializer.xml');
         $loader->load('resource-rest.xml');
 
-        $this->loadEnhancers($container, $loader, $config['enhancer_map']);
         $this->configurePayloadAliasRegistry($container, $config['payload_alias_map']);
-        $this->configureEnhancers($container, $config['enhancer_map']);
     }
 
     public function getNamespace()
@@ -60,66 +54,10 @@ public function getXsdValidationBasePath()
         return __DIR__.'/../Resources/config/schema';
     }
 
-    /**
-     * Automatically include native enhancers.
-     */
-    private function loadEnhancers(ContainerBuilder $container, LoaderInterface $loader, $enhancerMap)
-    {
-        $loaded = array();
-        foreach ($enhancerMap as $unit) {
-            $enhancerName = $unit['enhancer'];
-
-            if (!in_array($enhancerName, $this->nativeEnhancers)) {
-                continue;
-            }
-
-            if (isset($loaded[$enhancerName])) {
-                continue;
-            }
-
-            $loader->load('enhancer.'.$enhancerName.'.xml');
-            $loaded[$enhancerName] = true;
-        }
-
-        $bundles = $container->getParameter('kernel.bundles');
-
-        if (isset($loaded['sonata_admin'])) {
-            if (!isset($bundles['SonataAdminBundle'])) {
-                throw new \InvalidArgumentException(
-                    'You must enable the SonataAdminBundle in order to use the "sonata_admin" enhancer'
-                );
-            }
-        }
-    }
 
     private function configurePayloadAliasRegistry(ContainerBuilder $container, $aliasMap)
     {
         $registry = $container->getDefinition('cmf_resource_rest.registry.payload_alias');
         $registry->replaceArgument(1, $aliasMap);
     }
-
-    private function configureEnhancers(ContainerBuilder $container, $enhancerMap)
-    {
-        $enhancerMap = $this->normalizeEnhancerMap($enhancerMap);
-        $registry = $container->getDefinition('cmf_resource_rest.registry.enhancer');
-        $registry->replaceArgument(1, $enhancerMap);
-    }
-
-    private function normalizeEnhancerMap($enhancerMap)
-    {
-        // normalize enhancer map
-        $normalized = array();
-        foreach ($enhancerMap as $enhancerMapping) {
-            $repository = $enhancerMapping['repository'];
-            $enhancer = $enhancerMapping['enhancer'];
-
-            if (!isset($normalized[$repository])) {
-                $normalized[$repository] = array();
-            }
-
-            $normalized[$repository][] = $enhancer;
-        }
-
-        return $normalized;
-    }
 }

src/DependencyInjection/Compiler/EnhancerPass.php

@@ -26,9 +26,9 @@ public function getConfigTreeBuilder()
         $treeBuilder = new TreeBuilder();
         $treeBuilder->root('cmf_resource_rest')
             ->fixXmlConfig('payload_alias', 'payload_alias_map')
-            ->fixXmlConfig('enhance', 'enhancer_map')
             ->children()
                 ->integerNode('max_depth')->defaultValue(2)->end()
+                ->booleanNode('expose_payload')->defaultFalse()->end()
                 ->arrayNode('payload_alias_map')
                     ->useAttributeAsKey('name')
                     ->prototype('array')
@@ -38,14 +38,6 @@ public function getConfigTreeBuilder()
                          ->end()
                     ->end()
                 ->end()
-                ->arrayNode('enhancer_map')
-                    ->prototype('array')
-                        ->children()
-                            ->scalarNode('repository')->isRequired()->end()
-                            ->scalarNode('enhancer')->isRequired()->end()
-                        ->end()
-                    ->end()
-                ->end()
             ->end();
 
         return $treeBuilder;