makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 15:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4350 from marc1706/ticket/14670

Browse source 
[ticket/14670] Use symfony 3.x in master branch
This commit is contained in:
Máté Bartus 2016-07-29 17:51:50 +02:00 • committed by GitHub
commit 832722417a
13 changed files with 857 additions and 877 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
.travis.yml
View file

@ -2,30 +2,31 @@ language: php
matrix:
include:
- php: 5.4
- php: 5.5
env: DB=none;NOTESTS=1
- php: 5.4
env: DB=mysqli # MyISAM
- php: 5.4
env: DB=mysql
- php: 5.4
env: DB=mariadb
- php: 5.4
env: DB=postgres
- php: 5.4
env: DB=sqlite3
- php: 5.4
env: DB=mysqli;SLOWTESTS=1
- php: 5.5
env: DB=mysqli
- php: 5.5
env: DB=mysql
- php: 5.5
env: DB=mariadb
- php: 5.5
env: DB=postgres
- php: 5.5
env: DB=sqlite3
- php: 5.5
env: DB=mysqli;SLOWTESTS=1
- php: 5.6
env: DB=mysqli
- php: 7.0
env: DB=mysqli
- php: nightly
env: DB=mysqli
- php: hhvm
env: DB=mysqli
allow_failures:
- php: hhvm
- php: nightly
fast_finish: true
services:

47
phpBB/composer.json
View file

@ -25,42 +25,41 @@
"phpbb/phpbb-core": "self.version"
},
"require": {
"php": ">=5.4,<7.1",
"php": ">=5.5.9",
"bantu/ini-get-wrapper": "1.0.*",
"google/recaptcha": "~1.1",
"guzzlehttp/guzzle": "~5.3",
"guzzlehttp/guzzle": "~6.2",
"lusitanian/oauth": "^0.8.1",
"marc1706/fast-image-size": "1.1.*",
"paragonie/random_compat": "^1.2",
"patchwork/utf8": "1.1.*",
"s9e/text-formatter": "^0.5.4",
"symfony/config": "2.8.*",
"symfony/console": "2.8.*",
"symfony/debug": "2.8.*",
"symfony/dependency-injection": "2.8.*",
"symfony/event-dispatcher": "2.8.*",
"symfony/filesystem": "2.8.*",
"symfony/finder": "2.8.*",
"symfony/http-foundation": "2.8.*",
"symfony/http-kernel": "2.8.*",
"symfony/proxy-manager-bridge": "2.8.*",
"symfony/routing": "2.8.*",
"symfony/twig-bridge": "2.8.*",
"symfony/yaml": "2.8.*",
"symfony/config": "~3.1",
"symfony/console": "~3.1",
"symfony/debug": "~3.1",
"symfony/dependency-injection": "~3.1",
"symfony/event-dispatcher": "~3.1",
"symfony/filesystem": "~3.1",
"symfony/finder": "~3.1",
"symfony/http-foundation": "~3.1",
"symfony/http-kernel": "~3.1",
"symfony/proxy-manager-bridge": "~3.1",
"symfony/routing": "~3.1",
"symfony/twig-bridge": "~3.1",
"symfony/yaml": "~3.1",
"twig/twig": "1.*"
},
"require-dev": {
"fabpot/goutte": "~2.0",
"fabpot/goutte": "~3.1",
"facebook/webdriver": "~1.1",
"laravel/homestead": "~2.2",
"laravel/homestead": "~3.0",
"phing/phing": "2.4.*",
"phpunit/dbunit": "1.3.*",
"phpunit/phpunit": "4.1.*",
"sami/sami": "1.*",
"phpunit/dbunit": "~2.0",
"phpunit/phpunit": "~4.8",
"squizlabs/php_codesniffer": "2.*",
"symfony/browser-kit": "2.8.*",
"symfony/css-selector": "2.8.*",
"symfony/dom-crawler": "2.8.*"
"symfony/browser-kit": "~3.1",
"symfony/css-selector": "~3.1",
"symfony/dom-crawler": "~3.1"
},
"extra": {
"branch-alias": {
@ -69,7 +68,7 @@
},
"config": {
"platform": {
"php": "5.4"
"php": "5.5.9"
}
}
}

1631
phpBB/composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
phpBB/config/default/container/services_routing.yml
View file

@ -12,8 +12,6 @@ services:
class: Symfony\Component\HttpKernel\EventListener\RouterListener
arguments:
- '@router'
- null
- null
- '@request_stack'
tags:
- { name: kernel.event_subscriber }

2
phpunit.xml.dist
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"

9
tests/mock/container_builder.php
View file

@ -23,11 +23,11 @@ class phpbb_mock_container_builder implements ContainerInterface
*
* @param string $id The service identifier
* @param object $service The service instance
* @param string $scope The scope of the service
* @param bool $shared Whether service is shared
*
* @api
*/
public function set($id, $service, $scope = self::SCOPE_CONTAINER)
public function set($id, $service, $shared = false)
{
$this->services[$id] = $service;
}
@ -193,4 +193,9 @@ class phpbb_mock_container_builder implements ContainerInterface
{
return false;
}
public function initialized($id)
{
return true;
}
}

2
tests/notification/fixtures/services_notification.yml
View file

@ -70,7 +70,7 @@ services:
test:
class: phpbb\notification\type\test
scope: prototype
shared: false
parent: notification.type.base
tags:
- { name: notification.type }

4
tests/upload/fileupload_test.php
View file

@ -83,13 +83,13 @@ class phpbb_fileupload_test extends phpbb_test_case
$this->php_ini,
$plupload,
$this->request
), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
));
$this->container->set('files.types.local', new \phpbb\files\types\local(
$this->factory,
$this->language,
$this->php_ini,
$this->request
), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
));
$this->path = __DIR__ . '/fixture/';
$this->phpbb_root_path = $phpbb_root_path;

2
travis/phpunit-mariadb-travis.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"

2
travis/phpunit-mysql-travis.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"

2
travis/phpunit-mysqli-travis.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"

2
travis/phpunit-postgres-travis.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"

2
travis/phpunit-sqlite3-travis.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="true"
backupStaticAttributes="true"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"