Load the services from the package, not from the final application.

ecphp · Jun 17, 2020 · 8a65faa · 8a65faa
1 parent 4f3d864
commit 8a65faa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/Resources/config/routes/cas.yaml b/Resources/config/routes/cas.yaml
@@ -0,0 +1,3 @@
+cas_bundle:
+    resource: '@CasBundle/Resources/config/routes/routing.xml'
+    prefix: /cas
diff --git a/Resources/config/routes/cas_bundle.yaml b/Resources/config/routes/cas_bundle.yaml
diff --git a/src/DependencyInjection/CasExtension.php b/src/DependencyInjection/CasExtension.php
@@ -4,7 +4,9 @@
 
 namespace EcPhp\CasBundle\DependencyInjection;
 
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
@@ -21,6 +23,11 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
+        // Load CAS configuration.
         $container->setParameter('cas', $config);
+
+        // Load CAS services.
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $loader->load('services.yaml');
     }
 }
diff --git a/src/Resources/routing.xml → src/Resources/config/routes/routing.xml b/src/Resources/routing.xml → src/Resources/config/routes/routing.xml
diff --git a/Resources/config/packages/cas_services.yaml → src/Resources/config/services.yaml b/Resources/config/packages/cas_services.yaml → src/Resources/config/services.yaml
@@ -29,7 +29,7 @@ services:
         autowire: true
 
     EcPhp\CasBundle\Controller\:
-        resource: '@CasBundle/Controller/'
+        resource: '../Controller/'
         autowire: true
         autoconfigure: true
         tags: ['controller.service_arguments']