Merge branch '2.7' into 2.8

fabpot · fabpot · commit 5de9c354ddc2 · 2015-11-27T06:45:55.000+01:00
* 2.7:
  Fixed the wrong source name and the ja translation
  [Debug] fix readme: DebugClassLoader moved to debug itself
  [SecurityBundle] disable the init:acl command if ACL is not used
  [DI] remove useless condition around unset
  [Form] Disabled view data validation if "data_class" is set to null
  [HttpFoundation] Workaround HHVM rewriting HTTP response line
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -23,6 +23,18 @@
  */
 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
@@ -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
@@ -312,10 +312,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
                 $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
@@ -501,9 +501,7 @@ public function hasTag($name)
      */
     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
@@ -356,21 +356,11 @@ public function setData($modelData)
         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
@@ -11,8 +11,8 @@
                 <target>アップロードされたファイルが大きすぎます。小さなファイルで再度アップロードしてください。</target>
             </trans-unit>
             <trans-unit id="30">
-                <source>The CSRF token is invalid.</source>
-                <target>CSRFトークンが無効です。</target>
+                <source>The CSRF token is invalid. Please try to resubmit the form.</source>
+                <target>CSRFトークンが無効です、再送信してください。</target>
             </trans-unit>
         </body>
     </file>
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -840,19 +840,19 @@ public function testGetPropertyPathDefaultsToIndexedNameIfDataClassOfFirstParent
         $this->assertEquals(new PropertyPath('[name]'), $form->getPropertyPath());
     }
 
-    /**
-     * @expectedException \Symfony\Component\Form\Exception\LogicException
-     */
-    public function testViewDataMustNotBeObjectIfDataClassIsNull()
+    public function testViewDataMayBeObjectIfDataClassIsNull()
     {
+        $object = new \stdClass();
         $config = new FormConfigBuilder('name', null, $this->dispatcher);
         $config->addViewTransformer(new FixedDataTransformer(array(
             '' => '',
-            'foo' => new \stdClass(),
+            'foo' => $object,
         )));
         $form = new Form($config);
 
         $form->setData('foo');
+
+        $this->assertSame($object, $form->getViewData());
     }
 
     public function testViewDataMayBeArrayAccessIfDataClassIsNull()
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -329,16 +329,16 @@ public function sendHeaders()
             $this->setDate(\DateTime::createFromFormat('U', time()));
         }
 
-        // status
-        header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
-
         // headers
         foreach ($this->headers->allPreserveCase() as $name => $values) {
             foreach ($values as $value) {
                 header($name.': '.$value, false, $this->statusCode);
             }
         }
 
+        // status
+        header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
+
         // cookies
         foreach ($this->headers->getCookies() as $cookie) {
             setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());

Original file line number	Diff line number	Diff line change
`@@ -501,9 +501,7 @@ public function hasTag($name)`
`501`	`501`	`*/`
`502`	`502`	`public function clearTag($name)`
`503`	`503`	`{`
`504`		`- if (isset($this->tags[$name])) {`
`505`		`- unset($this->tags[$name]);`
`506`		`- }`
	`504`	`+ unset($this->tags[$name]);`
`507`	`505`
`508`	`506`	`return $this;`
`509`	`507`	`}`
Original file line number	Diff line number	Diff line change
`@@ -329,16 +329,16 @@ public function sendHeaders()`
`329`	`329`	`$this->setDate(\DateTime::createFromFormat('U', time()));`
`330`	`330`	`}`
`331`	`331`
`332`		`- // status`
`333`		`- header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);`
`334`		`-`
`335`	`332`	`// headers`
`336`	`333`	`foreach ($this->headers->allPreserveCase() as $name => $values) {`
`337`	`334`	`foreach ($values as $value) {`
`338`	`335`	`header($name.': '.$value, false, $this->statusCode);`
`339`	`336`	`}`
`340`	`337`	`}`
`341`	`338`
	`339`	`+ // status`
	`340`	`+ header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);`
	`341`	`+`
`342`	`342`	`// cookies`
`343`	`343`	`foreach ($this->headers->getCookies() as $cookie) {`
`344`	`344`	`setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());`