Merge with 3.6

This commit is contained in:
Romain Neutron
2012-03-12 18:40:21 +01:00
212 changed files with 18953 additions and 32930 deletions

View File

@@ -34,6 +34,7 @@ class ArrayCache extends DoctrineArray implements Cache
{
throw new Exception(sprintf('Unable to find key %s', $id));
}
return $this->fetch($id);
}
@@ -47,4 +48,4 @@ class ArrayCache extends DoctrineArray implements Cache
return;
}
}
}