Permalink
Browse files

Merge branch '2.2' into 2.3

* 2.2:
  corrected English grammar (s/does not exists/does not exist)
  [Process] Add more precision to Process::stop timeout
  [Process] Avoid zombie process in case of unit tests failure
  [Process] Fix #8739
  [Process] Add failing test for #8739
  [Process] Fix CS
  Fixed documentation grammar for AuthenticationManagerInterface::authenticate()
  [Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
  [TwigBridge] Prevent code extension to display warning
  Use strstr instead of strpos

Conflicts:
	src/Symfony/Component/Finder/Shell/Command.php
	src/Symfony/Component/Process/Process.php
  • Loading branch information...
2 parents 7ffb15e + 827c54e commit 622d370a07321329f5259c6f96d5c636104ad46b @fabpot fabpot committed Aug 13, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 ClassLoader.php
View
@@ -177,7 +177,7 @@ public function findFile($class)
$classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
foreach ($this->prefixes as $prefix => $dirs) {
- if (0 === strpos($class, $prefix)) {
+ if ($class === strstr($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
return $dir.DIRECTORY_SEPARATOR.$classPath;

0 comments on commit 622d370

Please sign in to comment.