converted file_exists calls to either is_file or is_dir where it makes sense

fabpot · fabpot · commit 0eae562cb21a · 2011-08-29T15:28:26.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -50,7 +50,7 @@ public function warmUp($cacheDir)
     {
         foreach ($this->registry->getEntityManagers() as $em) {
             // we need the directory no matter the proxy cache generation strategy
-            if (!file_exists($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
+            if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
                 if (false === @mkdir($proxyCacheDir, 0777, true)) {
                     throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', dirname($proxyCacheDir)));
                 }
diff --git a/src/Symfony/Bridge/Doctrine/Mapping/Driver/XmlDriver.php b/src/Symfony/Bridge/Doctrine/Mapping/Driver/XmlDriver.php
@@ -123,7 +123,7 @@ protected function initialize()
         $this->_classCache = array();
         if (null !== $this->_globalBasename) {
             foreach ($this->_paths as $path) {
-                if (file_exists($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
+                if (is_file($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
                     $this->_classCache = array_merge($this->_classCache, $this->_loadMappingFile($file));
                 }
             }
@@ -135,7 +135,7 @@ protected function _findMappingFile($className)
         $defaultFileName = str_replace('\\', '.', $className).$this->_fileExtension;
         foreach ($this->_paths as $path) {
             if (!isset($this->_prefixes[$path])) {
-                if (file_exists($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
                     return $path.DIRECTORY_SEPARATOR.$defaultFileName;
                 }
 
@@ -149,7 +149,7 @@ protected function _findMappingFile($className)
             }
 
             $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', '.').$this->_fileExtension;
-            if (file_exists($filename)) {
+            if (is_file($filename)) {
                 return $filename;
             }
 
diff --git a/src/Symfony/Bridge/Doctrine/Mapping/Driver/YamlDriver.php b/src/Symfony/Bridge/Doctrine/Mapping/Driver/YamlDriver.php
@@ -123,7 +123,7 @@ protected function initialize()
         $this->_classCache = array();
         if (null !== $this->_globalBasename) {
             foreach ($this->_paths as $path) {
-                if (file_exists($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
+                if (is_file($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
                     $this->_classCache = array_merge($this->_classCache, $this->_loadMappingFile($file));
                 }
             }
@@ -135,7 +135,7 @@ protected function _findMappingFile($className)
         $defaultFileName = str_replace('\\', '.', $className).$this->_fileExtension;
         foreach ($this->_paths as $path) {
             if (!isset($this->_prefixes[$path])) {
-                if (file_exists($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
                     return $path.DIRECTORY_SEPARATOR.$defaultFileName;
                 }
 
@@ -149,7 +149,7 @@ protected function _findMappingFile($className)
             }
 
             $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', '.').$this->_fileExtension;
-            if (file_exists($filename)) {
+            if (is_file($filename)) {
                 return $filename;
             }
 
diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
@@ -65,7 +65,7 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
             $mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']);
             // a bundle configuration is detected by realizing that the specified dir is not absolute and existing
             if (!isset($mappingConfig['is_bundle'])) {
-                $mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']);
+                $mappingConfig['is_bundle'] = !is_dir($mappingConfig['dir']);
             }
 
             if ($mappingConfig['is_bundle']) {
@@ -234,7 +234,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
             throw new \InvalidArgumentException(sprintf('Mapping definitions for Doctrine manager "%s" require at least the "type", "dir" and "prefix" options.', $objectManagerName));
         }
 
-        if (!file_exists($mappingConfig['dir'])) {
+        if (!is_dir($mappingConfig['dir'])) {
             throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
         }
 
diff --git a/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php b/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php
@@ -48,7 +48,7 @@ class_exists('Doctrine\ORM\Mapping\Driver\AnnotationDriver');
                     $className = substr($class, strlen($namespace) +1);
                     $file = $dir.DIRECTORY_SEPARATOR.$className.'.php';
 
-                    if (!file_exists($file)) {
+                    if (!is_file($file)) {
                         throw new \RuntimeException(sprintf('The proxy file "%s" does not exist. If you still have objects serialized in the session, you need to clear the session manually.', $file));
                     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -183,7 +183,7 @@ private function getContainerBuilder()
             throw new \LogicException(sprintf('Debug information about the container is only available in debug mode.'));
         }
 
-        if (!file_exists($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {
+        if (!is_file($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {
             throw new \LogicException(sprintf('Debug information about the container could not be found. Please clear the cache and try again.'));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -548,7 +548,7 @@ private function getValidatorXmlMappingFiles(ContainerBuilder $container)
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if (file_exists($file = dirname($reflection->getFilename()).'/Resources/config/validation.xml')) {
+            if (is_file($file = dirname($reflection->getFilename()).'/Resources/config/validation.xml')) {
                 $files[] = realpath($file);
                 $container->addResource(new FileResource($file));
             }
@@ -563,7 +563,7 @@ private function getValidatorYamlMappingFiles(ContainerBuilder $container)
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            if (file_exists($file = dirname($reflection->getFilename()).'/Resources/config/validation.yml')) {
+            if (is_file($file = dirname($reflection->getFilename()).'/Resources/config/validation.yml')) {
                 $files[] = realpath($file);
                 $container->addResource(new FileResource($file));
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -189,7 +189,7 @@ public function formatFile($file, $line, $text = null)
      */
     public function getFileLink($file, $line)
     {
-        if ($this->fileLinkFormat && file_exists($file)) {
+        if ($this->fileLinkFormat && is_file($file)) {
             return strtr($this->fileLinkFormat, array('%f' => $file, '%l' => $line));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Loader/TemplateLocator.php
@@ -33,7 +33,7 @@ class TemplateLocator implements FileLocatorInterface
      */
     public function __construct(FileLocatorInterface $locator, $cacheDir = null)
     {
-        if (null !== $cacheDir && file_exists($cache = $cacheDir.'/templates.php')) {
+        if (null !== $cacheDir && is_file($cache = $cacheDir.'/templates.php')) {
             $this->cache = require $cache;
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -61,8 +61,8 @@ static protected function getPhpUnitXmlDir()
 
         $dir = static::getPhpUnitCliConfigArgument();
         if ($dir === null &&
-            (file_exists(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml') ||
-            file_exists(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {
+            (is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml') ||
+            is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {
             $dir = getcwd();
         }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php
@@ -17,12 +17,12 @@
 while ($dir !== $lastDir) {
     $lastDir = $dir;
 
-    if (file_exists($dir.'/autoload.php')) {
+    if (is_file($dir.'/autoload.php')) {
         require_once $dir.'/autoload.php';
         break;
     }
 
-    if (file_exists($dir.'/autoload.php.dist')) {
+    if (is_file($dir.'/autoload.php.dist')) {
         require_once $dir.'/autoload.php.dist';
         break;
     }
@@ -52,7 +52,7 @@ public function __construct($testCase, $rootConfig, $environment, $debug)
         $this->testCase = $testCase;
 
         $fs = new Filesystem();
-        if (!$fs->isAbsolutePath($rootConfig) && !file_exists($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {
+        if (!$fs->isAbsolutePath($rootConfig) && !is_file($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {
             throw new \InvalidArgumentException(sprintf('The root config "%s" does not exist.', $rootConfig));
         }
         $this->rootConfig = $rootConfig;
@@ -62,7 +62,7 @@ public function __construct($testCase, $rootConfig, $environment, $debug)
 
     public function registerBundles()
     {
-        if (!file_exists($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {
+        if (!is_file($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {
             throw new \RuntimeException(sprintf('The bundles file "%s" does not exist.', $filename));
         }
 
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -55,7 +55,7 @@ static public function load($classes, $cacheDir, $name, $autoReload, $adaptive =
         $reload = false;
         if ($autoReload) {
             $metadata = $cacheDir.'/'.$name.$extension.'.meta';
-            if (!file_exists($metadata) || !file_exists($cache)) {
+            if (!is_file($metadata) || !is_file($cache)) {
                 $reload = true;
             } else {
                 $time = filemtime($cache);
@@ -65,7 +65,7 @@ static public function load($classes, $cacheDir, $name, $autoReload, $adaptive =
                     $reload = true;
                 } else {
                     foreach ($meta[0] as $resource) {
-                        if (!file_exists($resource) || filemtime($resource) > $time) {
+                        if (!is_file($resource) || filemtime($resource) > $time) {
                             $reload = true;
 
                             break;
@@ -75,7 +75,7 @@ static public function load($classes, $cacheDir, $name, $autoReload, $adaptive =
             }
         }
 
-        if (!$reload && file_exists($cache)) {
+        if (!$reload && is_file($cache)) {
             require_once $cache;
 
             return;
diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -227,15 +227,15 @@ public function findFile($class)
                 foreach ($dirs as $dir) {
                     $className = substr($class, $pos + 1);
                     $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
-                    if (file_exists($file)) {
+                    if (is_file($file)) {
                         return $file;
                     }
                 }
             }
 
             foreach ($this->namespaceFallbacks as $dir) {
                 $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
-                if (file_exists($file)) {
+                if (is_file($file)) {
                     return $file;
                 }
             }
@@ -248,15 +248,15 @@ public function findFile($class)
 
                 foreach ($dirs as $dir) {
                     $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
-                    if (file_exists($file)) {
+                    if (is_file($file)) {
                         return $file;
                     }
                 }
             }
 
             foreach ($this->prefixFallbacks as $dir) {
                 $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
-                if (file_exists($file)) {
+                if (is_file($file)) {
                     return $file;
                 }
             }
diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php
@@ -56,7 +56,7 @@ public function __toString()
      */
     public function isFresh()
     {
-        if (!file_exists($this->file)) {
+        if (!is_file($this->file)) {
             return false;
         }
 
@@ -65,7 +65,7 @@ public function isFresh()
         }
 
         $metadata = $this->file.'.meta';
-        if (!file_exists($metadata)) {
+        if (!is_file($metadata)) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -62,7 +62,7 @@ public function getResource()
      */
     public function isFresh($timestamp)
     {
-        if (!file_exists($this->resource)) {
+        if (!is_dir($this->resource)) {
             return false;
         }
 
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -59,7 +59,7 @@ public function getResource()
      */
     public function isFresh($timestamp)
     {
-        if (!file_exists($this->resource)) {
+        if (!is_file($this->resource)) {
             return false;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -313,7 +313,7 @@ private function validateSchema(\DOMDocument $dom, $file)
                 if (($extension = $this->container->getExtension($items[$i])) && false !== $extension->getXsdValidationBasePath()) {
                     $path = str_replace($extension->getNamespace(), str_replace('\\', '/', $extension->getXsdValidationBasePath()).'/', $items[$i + 1]);
 
-                    if (!file_exists($path)) {
+                    if (!is_file($path)) {
                         throw new \RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s"', get_class($extension), $path));
                     }
 
diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php
@@ -67,7 +67,7 @@ public function start()
 
         $file = $this->path.'/'.session_id().'.session';
 
-        $this->data = file_exists($file) ? unserialize(file_get_contents($file)) : array();
+        $this->data = is_file($file) ? unserialize(file_get_contents($file)) : array();
         $this->started = true;
     }
 
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -492,7 +492,7 @@ protected function lock(Request $request, Response $entry)
 
             // wait for the lock to be released
             $wait = 0;
-            while (file_exists($lock) && $wait < 5000000) {
+            while (is_file($lock) && $wait < 5000000) {
                 usleep($wait += 50000);
             }
 
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -123,7 +123,7 @@ public function lookup(Request $request)
         }
 
         list($req, $headers) = $match;
-        if (file_exists($body = $this->getPath($headers['x-content-digest'][0]))) {
+        if (is_file($body = $this->getPath($headers['x-content-digest'][0]))) {
             return $this->restoreResponse($headers, $body);
         }
 
@@ -282,7 +282,7 @@ private function getMetadata($key)
      */
     public function purge($url)
     {
-        if (file_exists($path = $this->getPath($this->getCacheKey(Request::create($url))))) {
+        if (is_file($path = $this->getPath($this->getCacheKey(Request::create($url))))) {
             unlink($path);
 
             return true;
@@ -302,7 +302,7 @@ private function load($key)
     {
         $path = $this->getPath($key);
 
-        return file_exists($path) ? file_get_contents($path) : false;
+        return is_file($path) ? file_get_contents($path) : false;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -396,7 +396,7 @@ public function getContainer()
      */
     public function loadClassCache($name = 'classes', $extension = '.php')
     {
-        if (!$this->booted && file_exists($this->getCacheDir().'/classes.map')) {
+        if (!$this->booted && is_file($this->getCacheDir().'/classes.map')) {
             ClassCollectionLoader::load(include($this->getCacheDir().'/classes.map'), $this->getCacheDir(), $name, $this->debug, false, $extension);
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Util/Filesystem.php b/src/Symfony/Component/HttpKernel/Util/Filesystem.php
@@ -34,13 +34,13 @@ public function copy($originFile, $targetFile, $override = false)
         $this->mkdir(dirname($targetFile));
 
         $mostRecent = false;
-        if (file_exists($targetFile)) {
+        if (is_file($targetFile)) {
             $statTarget = stat($targetFile);
             $statOrigin = stat($originFile);
             $mostRecent = $statOrigin['mtime'] > $statTarget['mtime'];
         }
 
-        if ($override || !file_exists($targetFile) || $mostRecent) {
+        if ($override || !is_file($targetFile) || $mostRecent) {
             copy($originFile, $targetFile);
         }
     }
diff --git a/src/Symfony/Component/Templating/Loader/CacheLoader.php b/src/Symfony/Component/Templating/Loader/CacheLoader.php
@@ -55,7 +55,7 @@ public function load(TemplateReferenceInterface $template)
         $file = substr($key, 2).'.tpl';
         $path = $dir.DIRECTORY_SEPARATOR.$file;
 
-        if (file_exists($path)) {
+        if (is_file($path)) {
             if (null !== $this->debugger) {
                 $this->debugger->log(sprintf('Fetching template "%s" from cache', $template->get('name')));
             }
@@ -69,7 +69,7 @@ public function load(TemplateReferenceInterface $template)
 
         $content = $storage->getContent();
 
-        if (!file_exists($dir)) {
+        if (!is_dir($dir)) {
             mkdir($dir, 0777, true);
         }
 
diff --git a/src/Symfony/Component/Templating/Loader/FilesystemLoader.php b/src/Symfony/Component/Templating/Loader/FilesystemLoader.php
@@ -51,7 +51,7 @@ public function load(TemplateReferenceInterface $template)
     {
         $file = $template->get('name');
 
-        if (self::isAbsolutePath($file) && file_exists($file)) {
+        if (self::isAbsolutePath($file) && is_file($file)) {
             return new FileStorage($file);
         }
 
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -64,7 +64,7 @@ public function isValid($value, Constraint $constraint)
 
         $path = $value instanceof FileObject ? $value->getPathname() : (string) $value;
 
-        if (!file_exists($path)) {
+        if (!is_file($path)) {
             $this->setMessage($constraint->notFoundMessage, array('{{ file }}' => $path));
 
             return false;
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/FileLoader.php

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function warmUp($cacheDir)`
`50`	`50`	`{`
`51`	`51`	`foreach ($this->registry->getEntityManagers() as $em) {`
`52`	`52`	`// we need the directory no matter the proxy cache generation strategy`
`53`		`- if (!file_exists($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {`
	`53`	`+ if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {`
`54`	`54`	`if (false === @mkdir($proxyCacheDir, 0777, true)) {`
`55`	`55`	`throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', dirname($proxyCacheDir)));`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ protected function initialize()`
`123`	`123`	`$this->_classCache = array();`
`124`	`124`	`if (null !== $this->_globalBasename) {`
`125`	`125`	`foreach ($this->_paths as $path) {`
`126`		`- if (file_exists($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {`
	`126`	`+ if (is_file($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {`
`127`	`127`	`$this->_classCache = array_merge($this->_classCache, $this->_loadMappingFile($file));`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -135,7 +135,7 @@ protected function _findMappingFile($className)`
`135`	`135`	`$defaultFileName = str_replace('\\', '.', $className).$this->_fileExtension;`
`136`	`136`	`foreach ($this->_paths as $path) {`
`137`	`137`	`if (!isset($this->_prefixes[$path])) {`
`138`		`- if (file_exists($path.DIRECTORY_SEPARATOR.$defaultFileName)) {`
	`138`	`+ if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {`
`139`	`139`	`return $path.DIRECTORY_SEPARATOR.$defaultFileName;`
`140`	`140`	`}`
`141`	`141`
`@@ -149,7 +149,7 @@ protected function _findMappingFile($className)`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`$filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', '.').$this->_fileExtension;`
`152`		`- if (file_exists($filename)) {`
	`152`	`+ if (is_file($filename)) {`
`153`	`153`	`return $filename;`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder`
`65`	`65`	`$mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']);`
`66`	`66`	`// a bundle configuration is detected by realizing that the specified dir is not absolute and existing`
`67`	`67`	`if (!isset($mappingConfig['is_bundle'])) {`
`68`		`- $mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']);`
	`68`	`+ $mappingConfig['is_bundle'] = !is_dir($mappingConfig['dir']);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if ($mappingConfig['is_bundle']) {`
`@@ -234,7 +234,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object`
`234`	`234`	`throw new \InvalidArgumentException(sprintf('Mapping definitions for Doctrine manager "%s" require at least the "type", "dir" and "prefix" options.', $objectManagerName));`
`235`	`235`	`}`
`236`	`236`
`237`		`- if (!file_exists($mappingConfig['dir'])) {`
	`237`	`+ if (!is_dir($mappingConfig['dir'])) {`
`238`	`238`	`throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class_exists('Doctrine\ORM\Mapping\Driver\AnnotationDriver');`
`48`	`48`	`$className = substr($class, strlen($namespace) +1);`
`49`	`49`	`$file = $dir.DIRECTORY_SEPARATOR.$className.'.php';`
`50`	`50`
`51`		`- if (!file_exists($file)) {`
	`51`	`+ if (!is_file($file)) {`
`52`	`52`	`throw new \RuntimeException(sprintf('The proxy file "%s" does not exist. If you still have objects serialized in the session, you need to clear the session manually.', $file));`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ private function getContainerBuilder()`
`183`	`183`	`throw new \LogicException(sprintf('Debug information about the container is only available in debug mode.'));`
`184`	`184`	`}`
`185`	`185`
`186`		`- if (!file_exists($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {`
	`186`	`+ if (!is_file($cachedFile = $this->getContainer()->getParameter('debug.container.dump'))) {`
`187`	`187`	`throw new \LogicException(sprintf('Debug information about the container could not be found. Please clear the cache and try again.'));`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public function formatFile($file, $line, $text = null)`
`189`	`189`	`*/`
`190`	`190`	`public function getFileLink($file, $line)`
`191`	`191`	`{`
`192`		`- if ($this->fileLinkFormat && file_exists($file)) {`
	`192`	`+ if ($this->fileLinkFormat && is_file($file)) {`
`193`	`193`	`return strtr($this->fileLinkFormat, array('%f' => $file, '%l' => $line));`
`194`	`194`	`}`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class TemplateLocator implements FileLocatorInterface`
`33`	`33`	`*/`
`34`	`34`	`public function __construct(FileLocatorInterface $locator, $cacheDir = null)`
`35`	`35`	`{`
`36`		`- if (null !== $cacheDir && file_exists($cache = $cacheDir.'/templates.php')) {`
	`36`	`+ if (null !== $cacheDir && is_file($cache = $cacheDir.'/templates.php')) {`
`37`	`37`	`$this->cache = require $cache;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ static protected function getPhpUnitXmlDir()`
`61`	`61`
`62`	`62`	`$dir = static::getPhpUnitCliConfigArgument();`
`63`	`63`	`if ($dir === null &&`
`64`		`- (file_exists(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml') \|\|`
`65`		`- file_exists(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {`
	`64`	`+ (is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml') \|\|`
	`65`	`+ is_file(getcwd().DIRECTORY_SEPARATOR.'phpunit.xml.dist'))) {`
`66`	`66`	`$dir = getcwd();`
`67`	`67`	`}`
`68`	`68`