diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
index fff5b1e929..14271dc459 100644
--- a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
+++ b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -23,6 +23,18 @@ use Doctrine\DBAL\Schema\SchemaException;
*/
class InitAclCommand extends ContainerAwareCommand
{
+ /**
+ * {@inheritdoc}
+ */
+ public function isEnabled()
+ {
+ if (!$this->getContainer()->has('security.acl.dbal.connection')) {
+ return false;
+ }
+
+ return parent::isEnabled();
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/src/Symfony/Component/Debug/README.md b/src/Symfony/Component/Debug/README.md
index 67e6d6c278..82c6e30322 100644
--- a/src/Symfony/Component/Debug/README.md
+++ b/src/Symfony/Component/Debug/README.md
@@ -15,6 +15,7 @@ Debug::enable();
You can also use the tools individually:
```php
+use Symfony\Component\Debug\DebugClassLoader;
use Symfony\Component\Debug\ErrorHandler;
use Symfony\Component\Debug\ExceptionHandler;
@@ -25,11 +26,9 @@ if ('cli' !== php_sapi_name()) {
ini_set('display_errors', 1);
}
ErrorHandler::register();
+DebugClassLoader::enable();
```
-Note that the `Debug::enable()` call also registers the debug class loader
-from the Symfony ClassLoader component when available.
-
This component can optionally take advantage of the features of the HttpKernel
and HttpFoundation components.
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 9351258db0..e11e3df4bf 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -312,10 +312,7 @@ class Container implements IntrospectableContainerInterface, ResettableContainer
$service = $this->$method();
} catch (\Exception $e) {
unset($this->loading[$id]);
-
- if (array_key_exists($id, $this->services)) {
- unset($this->services[$id]);
- }
+ unset($this->services[$id]);
if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
return;
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index 66ea2cc0e4..6b7138e0d7 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -501,9 +501,7 @@ class Definition
*/
public function clearTag($name)
{
- if (isset($this->tags[$name])) {
- unset($this->tags[$name]);
- }
+ unset($this->tags[$name]);
return $this;
}
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index 1d177d96b2..15bf3d3150 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -356,21 +356,11 @@ class Form implements \IteratorAggregate, FormInterface
if (!FormUtil::isEmpty($viewData)) {
$dataClass = $this->config->getDataClass();
- $actualType = is_object($viewData) ? 'an instance of class '.get_class($viewData) : 'a(n) '.gettype($viewData);
-
- if (null === $dataClass && is_object($viewData) && !$viewData instanceof \ArrayAccess) {
- $expectedType = 'scalar, array or an instance of \ArrayAccess';
-
- throw new LogicException(
- 'The form\'s view data is expected to be of type '.$expectedType.', '.
- 'but is '.$actualType.'. You '.
- 'can avoid this error by setting the "data_class" option to '.
- '"'.get_class($viewData).'" or by adding a view transformer '.
- 'that transforms '.$actualType.' to '.$expectedType.'.'
- );
- }
-
if (null !== $dataClass && !$viewData instanceof $dataClass) {
+ $actualType = is_object($viewData)
+ ? 'an instance of class '.get_class($viewData)
+ : 'a(n) '.gettype($viewData);
+
throw new LogicException(
'The form\'s view data is expected to be an instance of class '.
$dataClass.', but is '.$actualType.'. You can avoid this error '.
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf b/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf
index 2e8585a75c..0db5eddbe6 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.ja.xlf
@@ -11,8 +11,8 @@
アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。
- The CSRF token is invalid.
- CSRFトークンが無効です。
+ The CSRF token is invalid. Please try to resubmit the form.
+ CSRFトークンが無効です、再送信してください。