[console] Remove extra directory separators. (#315)

hechoendrupal · Feb 12, 2018 · d9b655d · d9b655d
1 parent 094c050
commit d9b655d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Bootstrap/DrupalConsoleCore.php b/src/Bootstrap/DrupalConsoleCore.php
@@ -59,11 +59,15 @@ public function boot()
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator($this->root));
 
+        if (substr($this->root, -1) === DIRECTORY_SEPARATOR) {
+            $this->root = substr($this->root, 0, -1);
+        }
+
         $servicesFiles = [
-            $this->root.DRUPAL_CONSOLE_CORE.'/services.yml',
+            $this->root.DRUPAL_CONSOLE_CORE.'services.yml',
             $this->root.'/services.yml',
-            $this->root.DRUPAL_CONSOLE.'/uninstall.services.yml',
-            $this->root.DRUPAL_CONSOLE.'/extend.console.uninstall.services.yml'
+            $this->root.DRUPAL_CONSOLE.'uninstall.services.yml',
+            $this->root.DRUPAL_CONSOLE.'extend.console.uninstall.services.yml'
         ];
 
         foreach ($servicesFiles as $servicesFile) {