Functional tests fail

Author: dantleech

AutoRoute/DefunctRouteHandler.php

@@ -2,6 +2,8 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\OperationStack;
+
 /**
  * Class which takes actions on routes which are left behind
  * after a content changes its URL.
@@ -16,28 +18,28 @@
 class DefunctRouteHandler implements DefunctRouteHandlerInterface
 {
     protected $serviceRegistry;
-    protected $driver;
+    protected $adapter;
 
     /**
      * @param ServiceRegistry auto routing service registry (for getting old route action)
-     * @param DriverInterface auto routing backend driver
-     * @param MappingFactory  auto routing mapping factory
+     * @param AdapterInterface auto routing backend adapter
+     * @param MetadataFactory  auto routing metadata factory
      */
     public function __consturct(
-        ServiceRegistry $serviceRegistry,
-        DriverInterface $driver,
-        MappingFactory $mappingFactory
+        MetadataFactory $metadataFactory,
+        AdapterInterface $adapter,
+        ServiceRegistry $serviceRegistry
     )
     {
         $this->serviceRegistry = $serviceRegistry;
-        $this->driver = $driver;
-        $this->mappingFactory = $mappingFactory;
+        $this->adapter = $adapter;
+        $this->metadataFactory = $metadataFactory;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function handleDefunctRoutes($oldRoutes, $document, $operationStack)
+    public function handleDefunctRoutes($document, OperationStack $operationStack)
     {
     }
 }

AutoRoute/DefunctRouteHandlerInterface.php

@@ -2,6 +2,8 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\OperationStack;
+
 /**
  * @author Daniel Leech <[email protected]>
  */
@@ -18,10 +20,7 @@ interface DefunctRouteHandlerInterface
      * or perhaps replaced with a redirect route, or indeed
      * left alone to continue depending on the configuration.
      *
-     * @param object $contentDocument  Document which is the subject
-     *   of the routes
-     * @param string[] $urls           List of URLs which now represent
-     *   the set of valid auto routes for this document
+     * TODO
      */
-    public function handleDefunctRoutes($document, $urls);
+    public function handleDefunctRoutes($document, OperationStack $operationStack);
 }

AutoRoute/Mapping/ClassMetadata.php

@@ -106,8 +106,4 @@ public function merge(MergeableInterface $metadata)
             $this->addTokenProvider($tokenName, $provider, true);
         }
     }
-
-    public function getTokenProviderConfigs()
-    {
-    }
 }

AutoRoute/Mapping/Exception/ClassNotMappedException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Mapping\Exception;
+
+class ClassNotMappedException extends \RuntimeException
+{
+}

AutoRoute/Mapping/Loader/YmlFileLoader.php

@@ -50,7 +50,7 @@ public function load($file, $type = null)
 
         // empty file
         if (empty($config)) {
-            return;
+            return array();
         }
 
         if (!is_array($config)) {

AutoRoute/Mapping/MetadataFactory.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Mapping;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Exception;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Mapping\Exception;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Metadata\MetadataFactoryInterface;
 use Metadata\Cache\CacheInterface;

AutoRoute/Mapping/MetadataFactoryBuilder.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Metadata;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Mapping;
 
 use Symfony\Component\Config\Loader\LoaderInterface;
 

AutoRoute/UrlGenerator.php

@@ -2,7 +2,7 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Driver\DriverInterface;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\Adapter\AdapterInterface;
 use Metadata\MetadataFactoryInterface;
 
 /**
@@ -18,12 +18,12 @@ class UrlGenerator implements UrlGeneratorInterface
 
     /**
      * @param MetadataFactory   the metadata factory
-     * @param DriverInterface  the autoroute backend driver (odm ,orm, etc)
+     * @param AdapterInterface  the autoroute backend driver (odm ,orm, etc)
      * @param ServiceRegistry  the auto route service registry
      */
     public function __construct(
         MetadataFactoryInterface $metadataFactory,
-        DriverInterface $driver,
+        AdapterInterface $driver,
         ServiceRegistry $serviceRegistry
     )
     {
@@ -40,7 +40,7 @@ public function generateUrl($document)
         $realClassName = $this->driver->getRealClassName(get_class($document));
         $metadata = $this->metadataFactory->getMetadataForClass($realClassName);
 
-        $tokenProviderConfigs = $metadata->getTokenProviderConfigs();
+        $tokenProviderConfigs = $metadata->getTokenProviders();
 
         $tokens = array();
         foreach ($tokenProviderConfigs as $name => $options) {

DependencyInjection/CmfRoutingAutoExtension.php

@@ -28,23 +28,19 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('auto_route.xml');
-        $loader->load('path_provider.xml');
-        $loader->load('exists_action.xml');
-        $loader->load('not_exists_action.xml');
-        $loader->load('route_maker.xml');
 
         $config = $processor->processConfiguration($configuration, $configs);
-        $chainFactoryDef = $container->getDefinition('cmf_routing_auto.factory');
 
-        $paths = array();
+        $resources = array();
+
         // auto mapping
         if ($config['auto_mapping']) {
-            $paths = $this->findMappingFiles($container->getParameter('kernel.bundles'));
+            $resources = $this->findMappingFiles($container->getParameter('kernel.bundles'));
         }
 
-        // add configured mapping file paths
-        foreach ($config['mapping']['paths'] as $path) {
-            $paths[] = $path;
+        // add configured mapping file resources
+        foreach ($config['mapping']['resources'] as $path) {
+            $resources[] = $path;
         }
         $container->setParameter('cmf_routing_auto.mapping.loader.resources', $paths);
 
@@ -55,16 +51,16 @@ public function load(array $configs, ContainerBuilder $container)
 
     protected function findMappingFiles($bundles)
     {
-        $paths = array();
+        $resources = array();
         foreach ($bundles as $bundle) {
             foreach (array('xml', 'yml') as $extension) {
                 if (file_exists($bundles->getPath().'/Resources/config/auto_routing.'.$extension)) {
-                    $paths[] = $extension;
+                    $resources[] = $extension;
                 }
             }
         }
 
-        return $paths;
+        return $resources;
     }
 
     public function getNamespace()

DependencyInjection/Configuration.php

@@ -28,7 +28,7 @@ public function getConfigTreeBuilder()
             ->children()
                 ->booleanNode('auto_mapping')->defaultTrue()->end()
                 ->arrayNode('mapping')
-                    ->fixXmlConfig('path')
+                    ->fixXmlConfig('resource')
                     ->children()
                         ->arrayNode('paths')
                             ->prototype('array')