Permalink
Browse files

[CS Fix] Consistent coding-style of concatenation operator usage

  • Loading branch information...
1 parent aeef488 commit d1e0a27c9c84fa0330b65f499edd7c75aac6b332 @canni canni committed Apr 2, 2013
Showing with 10 additions and 10 deletions.
  1. +6 −6 ClassLoader.php
  2. +1 −1 ClassMapGenerator.php
  3. +1 −1 Tests/ClassLoaderTest.php
  4. +1 −1 Tests/ClassMapGeneratorTest.php
  5. +1 −1 Tests/UniversalClassLoaderTest.php
View
@@ -170,29 +170,29 @@ public function findFile($class)
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
- $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
+ $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)).DIRECTORY_SEPARATOR;
$className = substr($class, $pos + 1);
} else {
// PEAR-like class name
$classPath = null;
$className = $class;
}
- $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+ $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
foreach ($this->prefixes as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
+ return $dir.DIRECTORY_SEPARATOR.$classPath;
}
}
}
}
foreach ($this->fallbackDirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
+ return $dir.DIRECTORY_SEPARATOR.$classPath;
}
}
@@ -121,7 +121,7 @@ private static function findClasses($path)
}
}
- $classes[] = ltrim($namespace . $class, '\\');
+ $classes[] = ltrim($namespace.$class, '\\');
break;
default:
break;
@@ -100,7 +100,7 @@ public function testUseIncludePath()
$loader->setUseIncludePath(true);
$this->assertTrue($loader->getUseIncludePath());
- set_include_path(__DIR__.'/Fixtures/includepath' . PATH_SEPARATOR . $includePath);
+ set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
$this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'includepath'.DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));
@@ -125,7 +125,7 @@ public function testCreateMapFinderSupport()
}
$finder = new \Symfony\Component\Finder\Finder();
- $finder->files()->in(__DIR__ . '/Fixtures/beta/NamespaceCollision');
+ $finder->files()->in(__DIR__.'/Fixtures/beta/NamespaceCollision');
$this->assertEqualsNormalized(array(
'NamespaceCollision\\A\\B\\Bar' => realpath(__DIR__).'/Fixtures/beta/NamespaceCollision/A/B/Bar.php',
@@ -49,7 +49,7 @@ public function testUseIncludePath()
$loader->useIncludePath(true);
$this->assertTrue($loader->getUseIncludePath());
- set_include_path(__DIR__.'/Fixtures/includepath' . PATH_SEPARATOR . $includePath);
+ set_include_path(__DIR__.'/Fixtures/includepath'.PATH_SEPARATOR.$includePath);
$this->assertEquals(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'includepath'.DIRECTORY_SEPARATOR.'Foo.php', $loader->findFile('Foo'));

0 comments on commit d1e0a27

Please sign in to comment.