Merge branch 'hotfix/zendframework/zendframework#6801-windows-unit-te…

…sts-support' into develop Close zendframework/zendframework#6801
zendframework · Nov 22, 2014 · f1cf594 · f1cf594
commit f1cf594
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/StandardAutoloader.php b/src/StandardAutoloader.php
@@ -89,7 +89,7 @@ public function setOptions($options)
                 case self::AUTOREGISTER_ZF:
                     if ($pairs) {
                         $this->registerNamespace('Zend', dirname(__DIR__));
-                        $this->registerNamespace('ZendXml', dirname(dirname((__DIR__))) . '/ZendXml');
+                        $this->registerNamespace('ZendXml', dirname(dirname((__DIR__))) . DIRECTORY_SEPARATOR .  'ZendXml');
                     }
                     break;
                 case self::LOAD_NS:

diff --git a/test/ClassMapAutoloaderTest.php b/test/ClassMapAutoloaderTest.php
@@ -167,14 +167,14 @@ public function testRegisterRegistersCallbackWithSplAutoload()
 
     public function testCanLoadClassMapFromPhar()
     {
-        $map = 'phar://' . __DIR__ . '/_files/classmap.phar/test/.//../autoload_classmap.php';
+        $map = 'phar://' . str_replace('/', DIRECTORY_SEPARATOR, __DIR__ . '/_files/classmap.phar/test/.//../autoload_classmap.php');
         $this->loader->registerAutoloadMap($map);
         $loaded = $this->loader->autoload('some\loadedclass');
         $this->assertSame('some\loadedclass', $loaded);
         $this->assertTrue(class_exists('some\loadedclass', false));
 
         // will not register duplicate, even with a different relative path
-        $map = 'phar://' . __DIR__ . '/_files/classmap.phar/test/./foo/../../autoload_classmap.php';
+        $map = 'phar://' . str_replace('/', DIRECTORY_SEPARATOR, __DIR__ . '/_files/classmap.phar/test/./foo/../../autoload_classmap.php');
         $this->loader->registerAutoloadMap($map);
         $test = $this->loader->getAutoloadMap();
         $this->assertEquals(1, count($test));