Permalink
Browse files

Updates to Symfony 2.0.4

  • Loading branch information...
1 parent d003330 commit ca374bbab35d6ce92efe301e2a64e3ca99b5c2d3 @dsyph3r committed Oct 26, 2011
Showing with 13 additions and 12 deletions.
  1. +3 −3 app/bootstrap.php.cache
  2. +6 −5 deps
  3. +4 −4 deps.lock
View
@@ -456,7 +456,7 @@ abstract class Kernel implements KernelInterface
protected $startTime;
protected $classes;
- const VERSION = '2.0.3';
+ const VERSION = '2.0.4';
public function __construct($environment, $debug)
@@ -835,7 +835,7 @@ abstract class Kernel implements KernelInterface
foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
if (!is_dir($dir)) {
if (false === @mkdir($dir, 0777, true)) {
- throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, dirname($dir)));
+ throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
}
} elseif (!is_writable($dir)) {
throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
@@ -992,7 +992,7 @@ class ClassCollectionLoader
$files = array();
$content = '';
foreach ($classes as $class) {
- if (!class_exists($class) && !interface_exists($class) && function_exists('trait_exists') && !trait_exists($class)) {
+ if (!class_exists($class) && !interface_exists($class) && (!function_exists('trait_exists') || !trait_exists($class))) {
throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
}
View
11 deps
@@ -1,6 +1,6 @@
[symfony]
git=http://github.com/symfony/symfony.git
- version=v2.0.3
+ version=v2.0.4
[twig]
git=http://github.com/fabpot/Twig.git
@@ -12,15 +12,15 @@
[doctrine-common]
git=http://github.com/doctrine/common.git
- version=2.1.1
+ version=2.1.2
[doctrine-dbal]
git=http://github.com/doctrine/dbal.git
- version=2.1.2
+ version=2.1.3
[doctrine]
git=http://github.com/doctrine/doctrine2.git
- version=2.1.1
+ version=2.1.2
[swiftmailer]
git=http://github.com/swiftmailer/swiftmailer.git
@@ -61,13 +61,14 @@
version=v1.0.1
+
[doctrine-fixtures]
git=http://github.com/doctrine/data-fixtures.git
[DoctrineFixturesBundle]
git=http://github.com/symfony/DoctrineFixturesBundle.git
target=/bundles/Symfony/Bundle/DoctrineFixturesBundle
-
+
[doctrine-migrations]
git=http://github.com/doctrine/migrations.git
View
@@ -1,9 +1,9 @@
-symfony 6a25df0ebf92074bf541fc7ca53d9fcd27981c3d
+symfony 1f2e72d84aa9a4829185d6b2a0b814f6b933b30a
twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5
monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2
-doctrine-common 174111c8d245d560e1af4c7455b730347f85686d
-doctrine-dbal edc628f7e7fa5a116b9b41838e7955c03f7af2e0
-doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5
+doctrine-common b385ca770888248241bd3086a40d5b3bd082a706
+doctrine-dbal e0b69790ab1ffd646fd70a04fdb91e5dfbb3ccf1
+doctrine 144d0de0ab61dffc738d7fb590cff8d77919f553
swiftmailer 8c3165691e36302405926abbae7526549db8b899
assetic f829ad23d23c87480151a21faad49fefe7c09e5d
twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54

0 comments on commit ca374bb

Please sign in to comment.