1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

Merge pull request #2679 from dhruvgoel92/ticket/12788

[ticket/12788] Update symfony components

* dhruvgoel92/ticket/12788:
  [ticket/12788] Force 2.3.* on symfony dependencies
  [ticket/12788] Update symfony components
This commit is contained in:
Andreas Fischer 2014-07-07 00:02:11 +02:00
commit bd0f692bf3
2 changed files with 88 additions and 83 deletions

View File

@ -22,6 +22,13 @@
"phpunit/phpunit": "4.1.*", "phpunit/phpunit": "4.1.*",
"phing/phing": "2.4.*", "phing/phing": "2.4.*",
"sami/sami": "1.*", "sami/sami": "1.*",
"squizlabs/php_codesniffer": "1.*" "squizlabs/php_codesniffer": "1.*",
"symfony/browser-kit": "2.3.*",
"symfony/debug": "2.3.*",
"symfony/dom-crawler": "2.3.*",
"symfony/filesystem": "2.3.*",
"symfony/finder": "2.3.*",
"symfony/http-foundation": "2.3.*",
"symfony/process": "2.3.*"
} }
} }

162
phpBB/composer.lock generated
View File

@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "300d29b350ca2d75b1fa169fe46470f0", "hash": "dcd46c1373cfc4dacd2e1f8a79da0b91",
"packages": [ "packages": [
{ {
"name": "lusitanian/oauth", "name": "lusitanian/oauth",
@ -108,17 +108,17 @@
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/Config", "target-dir": "Symfony/Component/Config",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Config.git", "url": "https://github.com/symfony/Config.git",
"reference": "91faa2d4944d0c8a94d5b73cb7ccfb219aee9d21" "reference": "259722b5f2e87d3f487630abfd40f922cf2f6900"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Config/zipball/91faa2d4944d0c8a94d5b73cb7ccfb219aee9d21", "url": "https://api.github.com/repos/symfony/Config/zipball/259722b5f2e87d3f487630abfd40f922cf2f6900",
"reference": "91faa2d4944d0c8a94d5b73cb7ccfb219aee9d21", "reference": "259722b5f2e87d3f487630abfd40f922cf2f6900",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -154,21 +154,21 @@
], ],
"description": "Symfony Config Component", "description": "Symfony Config Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-03-31 10:15:50" "time": "2014-04-22 08:09:28"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console.git", "url": "https://github.com/symfony/Console.git",
"reference": "df17996d37eb113a5675ca4cc2ac45f4fc057cb7" "reference": "c6c5a354a9945a5e9a9a6a495ca19558eb8639e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Console/zipball/df17996d37eb113a5675ca4cc2ac45f4fc057cb7", "url": "https://api.github.com/repos/symfony/Console/zipball/c6c5a354a9945a5e9a9a6a495ca19558eb8639e9",
"reference": "df17996d37eb113a5675ca4cc2ac45f4fc057cb7", "reference": "c6c5a354a9945a5e9a9a6a495ca19558eb8639e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -209,21 +209,21 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-03-01 17:25:29" "time": "2014-05-14 13:35:53"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v2.4.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/Debug", "target-dir": "Symfony/Component/Debug",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Debug.git", "url": "https://github.com/symfony/Debug.git",
"reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02" "reference": "ca764f8af9cc4ba5d81b598c1b18b30db5508e18"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Debug/zipball/6a8eb9aba50595014fef52d6b4d99b31dfaa6f02", "url": "https://api.github.com/repos/symfony/Debug/zipball/ca764f8af9cc4ba5d81b598c1b18b30db5508e18",
"reference": "6a8eb9aba50595014fef52d6b4d99b31dfaa6f02", "reference": "ca764f8af9cc4ba5d81b598c1b18b30db5508e18",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -234,13 +234,14 @@
"symfony/http-kernel": "~2.1" "symfony/http-kernel": "~2.1"
}, },
"suggest": { "suggest": {
"symfony/class-loader": "",
"symfony/http-foundation": "", "symfony/http-foundation": "",
"symfony/http-kernel": "" "symfony/http-kernel": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -266,21 +267,21 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-04-16 10:34:42" "time": "2014-04-29 19:42:43"
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/DependencyInjection", "target-dir": "Symfony/Component/DependencyInjection",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/DependencyInjection.git", "url": "https://github.com/symfony/DependencyInjection.git",
"reference": "41e9e2078e8edf261c11be478300c8fcddb64e30" "reference": "5ebd813eac59b4051705a2e29e32f211a966b6ca"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/41e9e2078e8edf261c11be478300c8fcddb64e30", "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/5ebd813eac59b4051705a2e29e32f211a966b6ca",
"reference": "41e9e2078e8edf261c11be478300c8fcddb64e30", "reference": "5ebd813eac59b4051705a2e29e32f211a966b6ca",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -324,21 +325,21 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-03-27 18:14:33" "time": "2014-05-02 22:42:57"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/EventDispatcher", "target-dir": "Symfony/Component/EventDispatcher",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/EventDispatcher.git", "url": "https://github.com/symfony/EventDispatcher.git",
"reference": "15645237c6ff70e74a28e8836362d82492765055" "reference": "cb7cd38c081507d10997553c4c522956a4d2afab"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/15645237c6ff70e74a28e8836362d82492765055", "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/cb7cd38c081507d10997553c4c522956a4d2afab",
"reference": "15645237c6ff70e74a28e8836362d82492765055", "reference": "cb7cd38c081507d10997553c4c522956a4d2afab",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -380,21 +381,21 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-02-11 10:29:24" "time": "2014-04-16 10:30:19"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v2.4.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/Filesystem", "target-dir": "Symfony/Component/Filesystem",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Filesystem.git", "url": "https://github.com/symfony/Filesystem.git",
"reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4" "reference": "69e476c4db31c43ab7ab797adc5fc73d20aa5571"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Filesystem/zipball/a3af8294bcce4a7c1b2892363b0c9d8109affad4", "url": "https://api.github.com/repos/symfony/Filesystem/zipball/69e476c4db31c43ab7ab797adc5fc73d20aa5571",
"reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4", "reference": "69e476c4db31c43ab7ab797adc5fc73d20aa5571",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -403,7 +404,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -429,33 +430,30 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-04-16 10:34:31" "time": "2014-04-16 10:30:19"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v2.4.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/HttpFoundation", "target-dir": "Symfony/Component/HttpFoundation",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpFoundation.git", "url": "https://github.com/symfony/HttpFoundation.git",
"reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b" "reference": "ad7891d4dfe221c5a9edca64b71bdb500f5b026a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/22c4dee84271ad0cd08d19f26d89f2878e11159b", "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/ad7891d4dfe221c5a9edca64b71bdb500f5b026a",
"reference": "22c4dee84271ad0cd08d19f26d89f2878e11159b", "reference": "ad7891d4dfe221c5a9edca64b71bdb500f5b026a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"require-dev": {
"symfony/expression-language": "~2.4"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.4-dev" "dev-master": "2.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -484,21 +482,21 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-04-18 21:02:05" "time": "2014-05-22 16:20:26"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/HttpKernel", "target-dir": "Symfony/Component/HttpKernel",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpKernel.git", "url": "https://github.com/symfony/HttpKernel.git",
"reference": "48d61b3622ca35dd924b167441a9810ad55906ce" "reference": "d8c00747f592183692afaacf622c444c36092613"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpKernel/zipball/48d61b3622ca35dd924b167441a9810ad55906ce", "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/d8c00747f592183692afaacf622c444c36092613",
"reference": "48d61b3622ca35dd924b167441a9810ad55906ce", "reference": "d8c00747f592183692afaacf622c444c36092613",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -557,21 +555,21 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-04-03 05:42:39" "time": "2014-05-31 02:04:21"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/Routing", "target-dir": "Symfony/Component/Routing",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Routing.git", "url": "https://github.com/symfony/Routing.git",
"reference": "08afcafd9af22a24a8055669f85d63b863c4711b" "reference": "6e4c9024a04340b83e456a1a24597dba066dcdc9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/08afcafd9af22a24a8055669f85d63b863c4711b", "url": "https://api.github.com/repos/symfony/Routing/zipball/6e4c9024a04340b83e456a1a24597dba066dcdc9",
"reference": "08afcafd9af22a24a8055669f85d63b863c4711b", "reference": "6e4c9024a04340b83e456a1a24597dba066dcdc9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -617,21 +615,21 @@
], ],
"description": "Symfony Routing Component", "description": "Symfony Routing Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-03-28 10:34:27" "time": "2014-04-23 13:35:47"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.3.12", "version": "v2.3.16",
"target-dir": "Symfony/Component/Yaml", "target-dir": "Symfony/Component/Yaml",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Yaml.git", "url": "https://github.com/symfony/Yaml.git",
"reference": "3acf34f6993db3d873fa77ac2cb6e595db00b88d" "reference": "2e257c292cfce88bf6c894a03d0fe8d782055aee"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Yaml/zipball/3acf34f6993db3d873fa77ac2cb6e595db00b88d", "url": "https://api.github.com/repos/symfony/Yaml/zipball/2e257c292cfce88bf6c894a03d0fe8d782055aee",
"reference": "3acf34f6993db3d873fa77ac2cb6e595db00b88d", "reference": "2e257c292cfce88bf6c894a03d0fe8d782055aee",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -666,7 +664,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2014-03-04 16:04:39" "time": "2014-05-12 09:13:35"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
@ -2170,17 +2168,17 @@
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
"version": "v2.3.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/BrowserKit", "target-dir": "Symfony/Component/BrowserKit",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/BrowserKit.git", "url": "https://github.com/symfony/BrowserKit.git",
"reference": "2639dc4eec81f92760e05396a93bb78000b4f5ca" "reference": "bc6cb0fe5196ecfe183483791928ed525ac41728"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/BrowserKit/zipball/2639dc4eec81f92760e05396a93bb78000b4f5ca", "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/bc6cb0fe5196ecfe183483791928ed525ac41728",
"reference": "2639dc4eec81f92760e05396a93bb78000b4f5ca", "reference": "bc6cb0fe5196ecfe183483791928ed525ac41728",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2223,21 +2221,21 @@
], ],
"description": "Symfony BrowserKit Component", "description": "Symfony BrowserKit Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18" "time": "2014-04-22 14:58:51"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v2.3.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/CssSelector", "target-dir": "Symfony/Component/CssSelector",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/CssSelector.git", "url": "https://github.com/symfony/CssSelector.git",
"reference": "885544201cb24e79754da1dbd61bd779c2e4353e" "reference": "2ff53e8a7870b453836e879b083b971d455e174d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/CssSelector/zipball/885544201cb24e79754da1dbd61bd779c2e4353e", "url": "https://api.github.com/repos/symfony/CssSelector/zipball/2ff53e8a7870b453836e879b083b971d455e174d",
"reference": "885544201cb24e79754da1dbd61bd779c2e4353e", "reference": "2ff53e8a7870b453836e879b083b971d455e174d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2276,21 +2274,21 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18" "time": "2014-05-12 09:13:35"
}, },
{ {
"name": "symfony/dom-crawler", "name": "symfony/dom-crawler",
"version": "v2.3.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/DomCrawler", "target-dir": "Symfony/Component/DomCrawler",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/DomCrawler.git", "url": "https://github.com/symfony/DomCrawler.git",
"reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b" "reference": "5dd259d7842480fa7c5d4a45c4f911bd6fb60bc8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/DomCrawler/zipball/e05e07fe8958a304b5e135f8e65d4ae6148cf59b", "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/5dd259d7842480fa7c5d4a45c4f911bd6fb60bc8",
"reference": "e05e07fe8958a304b5e135f8e65d4ae6148cf59b", "reference": "5dd259d7842480fa7c5d4a45c4f911bd6fb60bc8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2331,21 +2329,21 @@
], ],
"description": "Symfony DomCrawler Component", "description": "Symfony DomCrawler Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-07-21 12:12:18" "time": "2014-05-26 22:15:18"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v2.3.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/Finder", "target-dir": "Symfony/Component/Finder",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Finder.git", "url": "https://github.com/symfony/Finder.git",
"reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1" "reference": "32949721cc76afd75e4ac60d14ac3cf55b10a768"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1", "url": "https://api.github.com/repos/symfony/Finder/zipball/32949721cc76afd75e4ac60d14ac3cf55b10a768",
"reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1", "reference": "32949721cc76afd75e4ac60d14ac3cf55b10a768",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2380,21 +2378,21 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-08-13 20:18:00" "time": "2014-05-22 13:42:36"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.3.4", "version": "v2.3.16",
"target-dir": "Symfony/Component/Process", "target-dir": "Symfony/Component/Process",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Process.git", "url": "https://github.com/symfony/Process.git",
"reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b" "reference": "2cd7d075df6cb0d564c069a66408b3877c07d4e3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Process/zipball/1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b", "url": "https://api.github.com/repos/symfony/Process/zipball/2cd7d075df6cb0d564c069a66408b3877c07d4e3",
"reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b", "reference": "2cd7d075df6cb0d564c069a66408b3877c07d4e3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2429,7 +2427,7 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-08-22 06:42:25" "time": "2014-05-17 21:49:26"
} }
], ],
"aliases": [ "aliases": [