Merge branch '2.3' into 2.4

fabpot · fabpot · commit fb67a0cba91c · 2013-12-28T22:39:51.000+01:00
* 2.3:
  fixed typos
  Fixed deprecated method calls
  Add testing against HHVM at Travis-CI
  Fixed typo
  Fixed typo
  fixed acronyms
  [Validator] Fixed IBAN validator with 0750447346 value

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -259,7 +259,7 @@ public function preListenerCall($eventName, $listener)
      * @param object $listener  The listener
      * @param string $eventName The event name
      *
-     * @return array Informations about the listener
+     * @return array Information about the listener
      */
     private function getListenerInfo($listener, $eventName)
     {
diff --git a/Kernel.php b/Kernel.php
@@ -187,7 +187,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
     }
 
     /**
-     * Gets a http kernel from the container
+     * Gets a HTTP kernel from the container
      *
      * @return HttpKernel
      */

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ public function preListenerCall($eventName, $listener)`
`259`	`259`	`* @param object $listener The listener`
`260`	`260`	`* @param string $eventName The event name`
`261`	`261`	`*`
`262`		`- * @return array Informations about the listener`
	`262`	`+ * @return array Information about the listener`
`263`	`263`	`*/`
`264`	`264`	`private function getListenerInfo($listener, $eventName)`
`265`	`265`	`{`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`/**`
`190`		`- * Gets a http kernel from the container`
	`190`	`+ * Gets a HTTP kernel from the container`
`191`	`191`	`*`
`192`	`192`	`* @return HttpKernel`
`193`	`193`	`*/`