Commit a892989e authored by dsnopek's avatar dsnopek

Update to Symfony 2.6 as lowest supported version, so we can be compatible...

Update to Symfony 2.6 as lowest supported version, so we can be compatible with Symfony 3.x (need new method to replace deprecated method)
parent a0735444
......@@ -89,7 +89,6 @@ class Container {
require_once $file;
$c = new \CachedCiviContainer();
$c->set('service_container', $c);
return $c;
}
......@@ -134,13 +133,13 @@ class Container {
'Civi\Angular\Manager',
array()
))
->setFactoryService(self::SELF)->setFactoryMethod('createAngularManager');
->setFactory([new Reference(self::SELF), 'createAngularManager']);
$container->setDefinition('dispatcher', new Definition(
'Civi\Core\CiviEventDispatcher',
array(new Reference('service_container'))
))
->setFactoryService(self::SELF)->setFactoryMethod('createEventDispatcher');
->setFactory([new Reference(self::SELF), 'createEventDispatcher']);
$container->setDefinition('magic_function_provider', new Definition(
'Civi\API\Provider\MagicFunctionProvider',
......@@ -151,13 +150,13 @@ class Container {
'Civi\API\Kernel',
array(new Reference('dispatcher'), new Reference('magic_function_provider'))
))
->setFactoryService(self::SELF)->setFactoryMethod('createApiKernel');
->setFactory([new Reference(self::SELF), 'createApiKernel']);
$container->setDefinition('cxn_reg_client', new Definition(
'Civi\Cxn\Rpc\RegistrationClient',
array()
))
->setFactoryClass('CRM_Cxn_BAO_Cxn')->setFactoryMethod('createRegistrationClient');
->setFactory([new Reference(self::SELF), 'createRegistrationClient']);
$container->setDefinition('psr_log', new Definition('CRM_Core_Error_Log', array()));
......@@ -170,7 +169,7 @@ class Container {
'type' => array('*memory*', 'SqlGroup', 'ArrayCache'),
),
)
))->setFactoryClass('CRM_Utils_Cache')->setFactoryMethod('create');
))->setFactory('CRM_Utils_Cache::create');
}
$container->setDefinition('sql_triggers', new Definition(
......@@ -184,7 +183,7 @@ class Container {
));
$container->setDefinition('pear_mail', new Definition('Mail'))
->setFactoryClass('CRM_Utils_Mail')->setFactoryMethod('createMailer');
->setFactory('CRM_Utils_Mail::createMailer');
if (empty(\Civi::$statics[__CLASS__]['boot'])) {
throw new \RuntimeException("Cannot initialize container. Boot services are undefined.");
......@@ -206,7 +205,7 @@ class Container {
$container->setDefinition($name, new Definition(
$class
))
->setFactoryClass($class)->setFactoryMethod('singleton');
->setFactory([$class, 'singleton']);
}
$container->setDefinition('civi_token_compat', new Definition(
......
......@@ -36,13 +36,13 @@
"require": {
"dompdf/dompdf" : "0.8.*",
"electrolinux/phpquery": "^0.9.6",
"symfony/config": "~2.5 || ~3.0",
"symfony/dependency-injection": "~2.5 || ~3.0",
"symfony/event-dispatcher": "~2.5 || ~3.0",
"symfony/filesystem": "~2.5 || ~3.0",
"symfony/process": "~2.5 || ~3.0",
"symfony/config": "^2.6.13 || ~3.0",
"symfony/dependency-injection": "^2.6.13 || ~3.0",
"symfony/event-dispatcher": "^2.6.13 || ~3.0",
"symfony/filesystem": "^2.6.13 || ~3.0",
"symfony/process": "^2.6.13 || ~3.0",
"psr/log": "~1.0.0",
"symfony/finder": "~2.5 || ~3.0",
"symfony/finder": "^2.6.13 || ~3.0",
"tecnickcom/tcpdf" : "6.2.*",
"totten/ca-config": "~17.05",
"zetacomponents/base": "1.7.*",
......
......@@ -4,28 +4,25 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "85e3f6961c584d986a5a686b04bbed3d",
"content-hash": "1d0ba40a540772d8ca8b73f72fff02d8",
"packages": [
{
"name": "civicrm/civicrm-cxn-rpc",
"version": "v0.16.12.05",
"version": "v0.17.07.01",
"source": {
"type": "git",
"url": "https://github.com/civicrm/civicrm-cxn-rpc.git",
"reference": "e88e78dc491b7e8739a40231f46c2d4459347b12"
"reference": "2d934d45e65e907f4b0cabc67979b5f3f2b27135"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/civicrm/civicrm-cxn-rpc/zipball/e88e78dc491b7e8739a40231f46c2d4459347b12",
"reference": "e88e78dc491b7e8739a40231f46c2d4459347b12",
"url": "https://api.github.com/repos/civicrm/civicrm-cxn-rpc/zipball/2d934d45e65e907f4b0cabc67979b5f3f2b27135",
"reference": "2d934d45e65e907f4b0cabc67979b5f3f2b27135",
"shasum": ""
},
"require": {
"phpseclib/phpseclib": "1.0.*",
"psr/log": "1.0.0"
},
"require-dev": {
"phpunit/phpunit": "3.7.*"
"psr/log": "~1.0.0"
},
"type": "library",
"autoload": {
......@@ -44,7 +41,7 @@
}
],
"description": "RPC library for CiviConnect",
"time": "2016-12-06T04:32:51+00:00"
"time": "2017-07-18T04:02:44+00:00"
},
{
"name": "dompdf/dompdf",
......@@ -859,27 +856,30 @@
},
{
"name": "symfony/config",
"version": "v2.5.12",
"version": "v2.6.13",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "d93bb29acfa5cff771cb4aa0fb4a97454ddb41e4"
"reference": "0ca496cbe208fc37c4cf3415ebb3056e0963115b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/d93bb29acfa5cff771cb4aa0fb4a97454ddb41e4",
"reference": "d93bb29acfa5cff771cb4aa0fb4a97454ddb41e4",
"url": "https://api.github.com/repos/symfony/config/zipball/0ca496cbe208fc37c4cf3415ebb3056e0963115b",
"reference": "0ca496cbe208fc37c4cf3415ebb3056e0963115b",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/filesystem": "~2.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -892,40 +892,44 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
"time": "2015-01-03T08:01:13+00:00"
"homepage": "https://symfony.com",
"time": "2015-07-08T05:59:48+00:00"
},
{
"name": "symfony/dependency-injection",
"version": "v2.5.12",
"version": "v2.6.13",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "c42aee05b466cc9c66b87ddf7d263402befb6962"
"reference": "d9fe6837d74aed11e5ee741cd6b6dfe45e0af78e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c42aee05b466cc9c66b87ddf7d263402befb6962",
"reference": "c42aee05b466cc9c66b87ddf7d263402befb6962",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d9fe6837d74aed11e5ee741cd6b6dfe45e0af78e",
"reference": "d9fe6837d74aed11e5ee741cd6b6dfe45e0af78e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"conflict": {
"symfony/expression-language": "<2.6"
},
"require-dev": {
"symfony/config": "~2.2",
"symfony/expression-language": "~2.4,>=2.4.10",
"symfony/expression-language": "~2.6",
"symfony/phpunit-bridge": "~2.7",
"symfony/yaml": "~2.1"
},
"suggest": {
......@@ -936,7 +940,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -949,32 +953,32 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com",
"time": "2015-01-25T04:37:39+00:00"
"homepage": "https://symfony.com",
"time": "2015-07-22T10:08:40+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.5.12",
"version": "v2.6.13",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "af6eb6a9a1a3b411facfd8e7e3f82a6be7919c04"
"reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/af6eb6a9a1a3b411facfd8e7e3f82a6be7919c04",
"reference": "af6eb6a9a1a3b411facfd8e7e3f82a6be7919c04",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02",
"reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02",
"shasum": ""
},
"require": {
......@@ -983,7 +987,9 @@
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.0,>=2.0.5,<2.6.0",
"symfony/dependency-injection": "~2.6",
"symfony/expression-language": "~2.6",
"symfony/phpunit-bridge": "~2.7",
"symfony/stopwatch": "~2.3"
},
"suggest": {
......@@ -993,7 +999,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -1006,41 +1012,44 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
"time": "2015-01-29T18:20:43+00:00"
"homepage": "https://symfony.com",
"time": "2015-05-02T15:18:45+00:00"
},
{
"name": "symfony/filesystem",
"version": "v2.5.12",
"version": "v2.6.13",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "d3c24d7d6e9c342008d8421b2fade460311647ea"
"reference": "823c035b1a5c13a4924e324d016eb07e70f94735"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/d3c24d7d6e9c342008d8421b2fade460311647ea",
"reference": "d3c24d7d6e9c342008d8421b2fade460311647ea",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/823c035b1a5c13a4924e324d016eb07e70f94735",
"reference": "823c035b1a5c13a4924e324d016eb07e70f94735",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -1053,41 +1062,44 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
"time": "2015-01-03T21:04:44+00:00"
"homepage": "https://symfony.com",
"time": "2015-07-08T05:59:48+00:00"
},
{
"name": "symfony/finder",
"version": "v2.5.12",
"version": "v2.6.13",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
"reference": "e527ebf47ff912a45e148b7d0b107b80ec0b3cc2"
"url": "https://github.com/symfony/finder.git",
"reference": "203a10f928ae30176deeba33512999233181dd28"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/e527ebf47ff912a45e148b7d0b107b80ec0b3cc2",
"reference": "e527ebf47ff912a45e148b7d0b107b80ec0b3cc2",
"url": "https://api.github.com/repos/symfony/finder/zipball/203a10f928ae30176deeba33512999233181dd28",
"reference": "203a10f928ae30176deeba33512999233181dd28",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -1100,41 +1112,44 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
"time": "2015-01-03T08:01:13+00:00"
"homepage": "https://symfony.com",
"time": "2015-07-09T16:02:48+00:00"
},
{
"name": "symfony/process",
"version": "v2.5.12",
"version": "v2.6.13",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
"reference": "00a1308e8b5aec5eba7c8f1708426a78f929be8c"
"url": "https://github.com/symfony/process.git",
"reference": "57f1e88bb5dafa449b83f9f265b11d52d517b3e9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/00a1308e8b5aec5eba7c8f1708426a78f929be8c",
"reference": "00a1308e8b5aec5eba7c8f1708426a78f929be8c",
"url": "https://api.github.com/repos/symfony/process/zipball/57f1e88bb5dafa449b83f9f265b11d52d517b3e9",
"reference": "57f1e88bb5dafa449b83f9f265b11d52d517b3e9",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5-dev"
"dev-master": "2.6-dev"
}
},
"autoload": {
......@@ -1147,18 +1162,18 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
"time": "2015-02-08T07:07:45+00:00"
"homepage": "https://symfony.com",
"time": "2015-06-30T16:10:16+00:00"
},
{
"name": "tecnickcom/tcpdf",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment