Merge branch '2.7'

fabpot · fabpot · commit 0c569429ad76 · 2014-12-02T21:20:06.000+01:00
* 2.7: (65 commits) Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container [FrameworkBundle][Router Cmd] use debug namespace. [FrameworkBundle] Update deprecated service call Fix PHP Fatal error: Cannot call constructor in symfony/console/Symfony/Component/Console/Helper/DialogHelper.php on line 37 Removed a dev annotation from a version constraint Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes Append to PR symfony#12737 referring Ticket symfony#12704 Issue symfony#12658 Add a deprecation note about Translator's setFallbackLocale... Issue symfony#12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration... Hackday deprecated 12621 Added deprecation log for validate and validateValue on ExecutionContext... [Console] [Hackday] [2.7] Add a deprecation note about ProgressHelper [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method [Validator] Added a deprecation note about setPropertyAccessor symfony#12698 [Locale] Adding a deprecation note about the Locale component ...
diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php
@@ -155,8 +155,8 @@ public function infoAction($about)
     /**
      * Renders the Web Debug Toolbar.
      *
-     * @param Request $request  The current HTTP Request
-     * @param string  $token    The profiler token
+     * @param Request $request The current HTTP Request
+     * @param string  $token   The profiler token
      *
      * @return Response A Response instance
      *
diff --git a/Resources/views/Collector/time.html.twig b/Resources/views/Collector/time.html.twig
@@ -115,7 +115,7 @@
         /**
          * Query an element with a CSS selector.
          *
-         * @param  string selector a CSS-selector-compatible query string.
+         * @param string selector a CSS-selector-compatible query string.
          *
          * @return DOMElement|null
          */
diff --git a/Tests/Profiler/TemplateManagerTest.php b/Tests/Profiler/TemplateManagerTest.php
@@ -100,9 +100,9 @@ public function testGetTemplates()
             ->will($this->returnCallback(array($this, 'profileHasCollectorCallback')));
 
         $result = $this->templateManager->getTemplates($profile);
-        $this->assertArrayHasKey('foo',$result);
-        $this->assertArrayNotHasKey('bar',$result);
-        $this->assertArrayNotHasKey('baz',$result);
+        $this->assertArrayHasKey('foo', $result);
+        $this->assertArrayNotHasKey('bar', $result);
+        $this->assertArrayNotHasKey('baz', $result);
     }
 
     public function profilerHasCallback($panel)
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,6 +6,11 @@
          colors="true"
          bootstrap="vendor/autoload.php"
 >
+    <php>
+        <!-- Disable E_USER_DEPRECATED until 3.0 -->
+        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
+        <ini name="error_reporting" value="-16385"/>
+    </php>
 
     <testsuites>
         <testsuite name="Symfony WebProfilerBundle Test Suite">

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ public function infoAction($about)`
`155`	`155`	`/**`
`156`	`156`	`* Renders the Web Debug Toolbar.`
`157`	`157`	`*`
`158`		`- * @param Request $request The current HTTP Request`
`159`		`- * @param string $token The profiler token`
	`158`	`+ * @param Request $request The current HTTP Request`
	`159`	`+ * @param string $token The profiler token`
`160`	`160`	`*`
`161`	`161`	`* @return Response A Response instance`
`162`	`162`	`*`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@`
`115`	`115`	`/**`
`116`	`116`	`* Query an element with a CSS selector.`
`117`	`117`	`*`
`118`		`- * @param string selector a CSS-selector-compatible query string.`
	`118`	`+ * @param string selector a CSS-selector-compatible query string.`
`119`	`119`	`*`
`120`	`120`	`* @return DOMElement\|null`
`121`	`121`	`*/`