Updated code for the recent renamings

Author: wouterj

src/DependencyInjection/CmfResourceExtension.php

@@ -48,10 +48,11 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('twig.xml');
         $container->setParameter('cmf_resource.description.enabled_enhancers', $config['description']['enhancers']);
 
-        $this->loadRepositories($container, $config['repositories']);
+        $container->setParameter('cmf_resource.repositories.default_name', $config['default_repository']);
+        $this->loadRepositories($container, $config['repositories'], $config['default_repository']);
     }
 
-    private function loadRepositories(ContainerBuilder $container, array $configs)
+    private function loadRepositories(ContainerBuilder $container, array $configs, $defaultRepositoryName)
     {
         $repositoryTypes = array_keys($this->repositoryFactories);
         $typeMap = [];
@@ -87,6 +88,9 @@ private function loadRepositories(ContainerBuilder $container, array $configs)
             $serviceMap[$repositoryName] = $serviceId;
 
             $container->setDefinition($serviceId, $definition);
+            if ($defaultRepositoryName == $repositoryName) {
+                $container->setAlias('cmf_resource.repository', $serviceId);
+            }
         }
 
         $registry = $container->getDefinition('cmf_resource.registry');

src/DependencyInjection/Configuration.php

@@ -100,6 +100,7 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end() // repositories
+                ->scalarNode('default_repository')->defaultValue('default')->end()
             ->end();
 
         return $treeBuilder;

src/Registry/RepositoryRegistry.php

@@ -27,20 +27,24 @@ class RepositoryRegistry implements RepositoryRegistryInterface
     private $serviceMap = [];
     private $typeMap = [];
     private $names = [];
+    private $defaultRepositoryName;
 
     /**
      * @param ContainerInterface $container
      * @param array              $serviceMap
      * @param array              $typeMap
+     * @param string             $defaultRepositoryName
      */
     public function __construct(
         ContainerInterface $container,
         array $serviceMap,
-        array $typeMap
+        array $typeMap,
+        $defaultRepositoryName
     ) {
         $this->container = $container;
         $this->serviceMap = $serviceMap;
         $this->typeMap = $typeMap;
+        $this->defaultRepositoryName = $defaultRepositoryName;
     }
 
     /**
@@ -67,9 +71,9 @@ public function all()
     /**
      * {@inheritdoc}
      */
-    public function get($repositoryName)
+    public function get($repositoryName = null)
     {
-        if (!isset($this->serviceMap[$repositoryName])) {
+        if (!isset($this->serviceMap[$repositoryName ?: $defaultRepositoryName])) {
             throw new \InvalidArgumentException(sprintf(
                 'Repository "%s" has not been registered, available repositories: "%s".',
                 $repositoryName,
@@ -86,7 +90,7 @@ public function get($repositoryName)
     /**
      * {@inheritdoc}
      */
-    public function getRepositoryAlias(ResourceRepository $repository)
+    public function getRepositoryName(ResourceRepository $repository)
     {
         $hash = spl_object_hash($repository);
         if (isset($this->names[$hash])) {

src/Resources/config/resource.xml

@@ -11,6 +11,7 @@
             <argument type="service" id="service_container"/>
             <argument /> <!-- service map -->
             <argument /> <!-- type map -->
+            <argument>%cmf_resource.repositories.default_name%</argument>
         </service>
 
     </services>

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -71,6 +71,7 @@ public function assertConfig($source)
                     ],
                 ],
             ],
+            'default_repository' => 'default',
         ], $config);
     }
 }

tests/Unit/Registry/RepositoryRegistryTest.php

@@ -41,7 +41,7 @@ public function testReturnConfigured()
 
         $repository = $registry->get('test');
         $this->assertInstanceOf(ResourceRepository::class, $repository);
-        $this->assertEquals('test', $registry->getRepositoryAlias($repository));
+        $this->assertEquals('test', $registry->getRepositoryName($repository));
         $this->assertEquals('test/type', $registry->getRepositoryType($repository));
     }
 
@@ -63,17 +63,17 @@ public function testUnknownRepositoryName()
     }
 
     /**
-     * It should throw an exception if an alias is requested for an unknown repository.
+     * It should throw an exception if an name is requested for an unknown repository.
      *
      * @expectedException \RuntimeException
      * @expectedExceptionMessage I don't know what its name is
      */
-    public function testGetAliasUnknownRepository()
+    public function testGetNameUnknownRepository()
     {
         $registry = $this->createRegistry([]);
 
         $repository = $this->prophesize(ResourceRepository::class);
-        $registry->getRepositoryAlias($repository->reveal());
+        $registry->getRepositoryName($repository->reveal());
     }
 
     /**
@@ -138,7 +138,8 @@ private function createRegistry(array $serviceMap)
         return new RepositoryRegistry(
             $this->container,
             $serviceMap,
-            $typeMap
+            $typeMap,
+            'default'
         );
     }
 }