Merge remote-tracking branch 'upstream/develop' into ticket/11015

* upstream/develop: (196 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  ...

Conflicts:
	phpBB/includes/functions.php
	tests/cache/cache_test.php

code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php

@@ -35,7 +35,7 @@ public function register()
 	* @param int				  $stackPtr  The position of the current token
 	*										in the stack passed in $tokens.
 	*
-	* @return void
+	* @return null
 	*/
 	public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	{
@@ -120,7 +120,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 	 * @param integer The stack pointer for the first comment token.
 	 * @param array(string=>array) $tags The found file doc comment tags.
 	 * 
-	 * @return void
+	 * @return null
 	 */
 	protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
 	{
@@ -143,7 +143,7 @@ protected function processPackage(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
      * @param integer The stack pointer for the first comment token.
      * @param array(string=>array) $tags The found file doc comment tags.
      * 
-     * @return void
+     * @return null
 	 */
 	protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
     {
@@ -166,7 +166,7 @@ protected function processVersion(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
      * @param integer The stack pointer for the first comment token.
      * @param array(string=>array) $tags The found file doc comment tags.
      * 
-     * @return void
+     * @return null
      */
     protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
     {
@@ -189,7 +189,7 @@ protected function processCopyright(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags
      * @param integer The stack pointer for the first comment token.
      * @param array(string=>array) $tags The found file doc comment tags.
      * 
-     * @return void
+     * @return null
      */
     protected function processLicense(PHP_CodeSniffer_File $phpcsFile, $ptr, $tags)
     {

phpBB/adm/style/ajax.js

@@ -36,7 +36,7 @@ phpbb.add_ajax_callback('row_down', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.up').html(img_templates.up_disabled);
+		tr_swap.find('.up').html(img_templates.up_disabled.clone());
 	}
 
 	tr.insertAfter(tr_swap);
@@ -48,7 +48,7 @@ phpbb.add_ajax_callback('row_down', function() {
 	*/
 	if (tr.is(':last-child'))
 	{
-		tr.find('.down').html(img_templates.down_disabled);
+		tr.find('.down').html(img_templates.down_disabled.clone());
 
 		var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
 		tr_swap.find('.down').html(down_img);
@@ -82,7 +82,7 @@ phpbb.add_ajax_callback('row_up', function() {
 			overlay: false
 		});
 
-		tr_swap.find('.down').html(img_templates.down_disabled);
+		tr_swap.find('.down').html(img_templates.down_disabled.clone());
 	}
 
 	tr.insertBefore(tr_swap);
@@ -94,7 +94,7 @@ phpbb.add_ajax_callback('row_up', function() {
 	*/
 	if (tr.is(':first-child'))
 	{
-		tr.find('.up').html(img_templates.up_disabled);
+		tr.find('.up').html(img_templates.up_disabled.clone());
 
 		var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
 		tr_swap.find('.up').html(up_img);

phpBB/app.php

@@ -0,0 +1,31 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+*/
+
+/**
+* @ignore
+*/
+define('IN_PHPBB', true);
+$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
+$phpEx = substr(strrchr(__FILE__, '.'), 1);
+include($phpbb_root_path . 'common.' . $phpEx);
+include($phpbb_root_path . 'includes/functions_url_matcher.' . $phpEx);
+
+// Start session management
+$user->session_begin();
+$auth->acl($user->data);
+$user->setup('app');
+
+$symfony_request = phpbb_create_symfony_request($request);
+$http_kernel = $phpbb_container->get('http_kernel');
+$response = $http_kernel->handle($symfony_request);
+$response->send();
+$http_kernel->terminate($symfony_request, $response);

phpBB/common.php

@@ -8,10 +8,6 @@
 * Minimum Requirement: PHP 5.3.3
 */
 
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
 /**
 */
 if (!defined('IN_PHPBB'))
@@ -94,6 +90,7 @@
 	),
 	array(
 		new phpbb_di_pass_collection_pass(),
+		new phpbb_di_pass_kernel_pass(),
 	),
 	$phpbb_root_path,
 	$phpEx

phpBB/composer.json

@@ -5,9 +5,10 @@
 		"symfony/dependency-injection": "2.1.*",
 		"symfony/event-dispatcher": "2.1.*",
 		"symfony/http-kernel": "2.1.*",
+		"symfony/routing": "2.1.*",
 		"symfony/yaml": "2.1.*"
 	},
 	"require-dev": {
-		"fabpot/goutte": "1.0.x-dev"
+		"fabpot/goutte": "v0.1.0"
 	}
 }