Merge branch 'hotfix/8'

Close #8

Author: weierophinney

test/ZendViewRendererFactoryTest.php

@@ -163,12 +163,15 @@ public function testConfiguresPaths()
         $this->assertPathNamespaceCount(2, 'bar', $paths);
         $this->assertPathNamespaceCount(3, null, $paths);
 
-        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/bar/', 'foo', $paths, var_export($paths, 1));
-        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/baz/', 'bar', $paths);
-        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/bat/', 'bar', $paths);
-        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/one/', null, $paths);
-        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/two/', null, $paths);
-        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/three/', null, $paths);
+        $dirSlash = DIRECTORY_SEPARATOR;
+        // @codingStandardsIgnoreStart
+        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/bar' . $dirSlash, 'foo', $paths, var_export($paths, 1));
+        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/baz' . $dirSlash, 'bar', $paths);
+        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/bat' . $dirSlash, 'bar', $paths);
+        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/one' . $dirSlash, null, $paths);
+        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/two' . $dirSlash, null, $paths);
+        $this->assertPathNamespaceContains(__DIR__ . '/TestAsset/three' . $dirSlash, null, $paths);
+        // @codingStandardsIgnoreEnd
     }
 
     public function testConfiguresTemplateMap()

test/ZendViewRendererTest.php

@@ -99,8 +99,8 @@ public function testCanAddPathWithEmptyNamespace()
         $paths = $renderer->getPaths();
         $this->assertInternalType('array', $paths);
         $this->assertEquals(1, count($paths));
-        $this->assertTemplatePath(__DIR__ . '/TestAsset/', $paths[0]);
-        $this->assertTemplatePathString(__DIR__ . '/TestAsset/', $paths[0]);
+        $this->assertTemplatePath(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
+        $this->assertTemplatePathString(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertEmptyTemplatePathNamespace($paths[0]);
     }
 
@@ -111,8 +111,8 @@ public function testCanAddPathWithNamespace()
         $paths = $renderer->getPaths();
         $this->assertInternalType('array', $paths);
         $this->assertEquals(1, count($paths));
-        $this->assertTemplatePath(__DIR__ . '/TestAsset/', $paths[0]);
-        $this->assertTemplatePathString(__DIR__ . '/TestAsset/', $paths[0]);
+        $this->assertTemplatePath(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
+        $this->assertTemplatePathString(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertTemplatePathNamespace('test', $paths[0]);
     }