Merge pull request #79 from das-peter/windows-class-naming-fix

Issue #2522032 by das-peter: AnnotatedClassDiscovery::getDefinitions(…
LionsAd · Jul 2, 2015 · ab5a955 · ab5a955
2 parents 1de9f3d + 311c362
commit ab5a955
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...s/service_container_annotation_discovery/src/Plugin/Discovery/AnnotatedClassDiscovery.php b/...s/service_container_annotation_discovery/src/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -125,8 +125,8 @@ public function getDefinitions() {
           foreach ($iterator as $fileinfo) {
             if ($fileinfo->getExtension() == 'php') {
               $sub_path = $iterator->getSubIterator()->getSubPath();
-              $sub_path = $sub_path ? str_replace(DIRECTORY_SEPARATOR, '\\', $sub_path) . '\\' : '';
-              $class = $namespace . '\\' . str_replace(DIRECTORY_SEPARATOR, '\\', $this->pluginManagerDefinition['directory']) . '\\' . $sub_path . $fileinfo->getBasename('.php');
+              $sub_path = $sub_path ? str_replace('/', '\\', $sub_path) . '\\' : '';
+              $class = $namespace . '\\' . str_replace('/', '\\', $this->pluginManagerDefinition['directory']) . '\\' . $sub_path . $fileinfo->getBasename('.php');
 
               // The filename is already known, so there is no need to find the
               // file. However, StaticReflectionParser needs a finder, so use a