aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-01-14 18:23:03 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-15 09:35:39 +0100
commit31e33fc42e76bad4aca448f13f3f6fc7fd1f0641 (patch)
tree06b9848db37b2774fc1d277ee92c5851696e36a2
parent73cd160bfc6e4a1b88f2117eb0c097a91ac5c753 (diff)
downloadwallabag-31e33fc42e76bad4aca448f13f3f6fc7fd1f0641.tar.gz
wallabag-31e33fc42e76bad4aca448f13f3f6fc7fd1f0641.tar.zst
wallabag-31e33fc42e76bad4aca448f13f3f6fc7fd1f0641.zip
Update to Symfony 3.0.x
-rw-r--r--composer.json11
-rw-r--r--composer.lock269
2 files changed, 31 insertions, 249 deletions
diff --git a/composer.json b/composer.json
index 46630f77..78b32307 100644
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,8 @@
28 "issues": "https://github.com/wallabag/wallabag/issues" 28 "issues": "https://github.com/wallabag/wallabag/issues"
29 }, 29 },
30 "require": { 30 "require": {
31 "php": ">=5.5.0", 31 "php": ">=5.5.9",
32 "symfony/symfony": "~2.8", 32 "symfony/symfony": "3.0.*",
33 "doctrine/orm": "^2.5", 33 "doctrine/orm": "^2.5",
34 "doctrine/doctrine-bundle": "^1.6", 34 "doctrine/doctrine-bundle": "^1.6",
35 "doctrine/doctrine-cache-bundle": "^1.2", 35 "doctrine/doctrine-cache-bundle": "^1.2",
@@ -66,9 +66,9 @@
66 }, 66 },
67 "require-dev": { 67 "require-dev": {
68 "doctrine/doctrine-fixtures-bundle": "~2.2", 68 "doctrine/doctrine-fixtures-bundle": "~2.2",
69 "sensio/generator-bundle": "~3.0", 69 "sensio/generator-bundle": "^3.0",
70 "phpunit/phpunit": "~4.4", 70 "phpunit/phpunit": "~4.4",
71 "symfony/phpunit-bridge": "~2.7" 71 "symfony/phpunit-bridge": "^2.7"
72 }, 72 },
73 "scripts": { 73 "scripts": {
74 "build-parameters": [ 74 "build-parameters": [
@@ -91,7 +91,10 @@
91 }, 91 },
92 "extra": { 92 "extra": {
93 "symfony-app-dir": "app", 93 "symfony-app-dir": "app",
94 "symfony-bin-dir": "bin",
95 "symfony-var-dir": "var",
94 "symfony-web-dir": "web", 96 "symfony-web-dir": "web",
97 "symfony-tests-dir": "tests",
95 "symfony-assets-install": "relative", 98 "symfony-assets-install": "relative",
96 "incenteev-parameters": { 99 "incenteev-parameters": {
97 "file": "app/config/parameters.yml", 100 "file": "app/config/parameters.yml",
diff --git a/composer.lock b/composer.lock
index 3740d4ef..13eac03f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "786f108cf7727020aa2f003dccd9a58e", 7 "hash": "084bbfd3166c16fd6bb6feb2c954a9da",
8 "content-hash": "d8c2f517c9cd9d9ec767a0b396a11de7", 8 "content-hash": "9352d3c7f307a23d5fec42c350ea0653",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "behat/transliterator", 11 "name": "behat/transliterator",
@@ -2671,48 +2671,6 @@
2671 "time": "2015-11-10 17:04:01" 2671 "time": "2015-11-10 17:04:01"
2672 }, 2672 },
2673 { 2673 {
2674 "name": "ircmaxell/password-compat",
2675 "version": "v1.0.4",
2676 "source": {
2677 "type": "git",
2678 "url": "https://github.com/ircmaxell/password_compat.git",
2679 "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
2680 },
2681 "dist": {
2682 "type": "zip",
2683 "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
2684 "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
2685 "shasum": ""
2686 },
2687 "require-dev": {
2688 "phpunit/phpunit": "4.*"
2689 },
2690 "type": "library",
2691 "autoload": {
2692 "files": [
2693 "lib/password.php"
2694 ]
2695 },
2696 "notification-url": "https://packagist.org/downloads/",
2697 "license": [
2698 "MIT"
2699 ],
2700 "authors": [
2701 {
2702 "name": "Anthony Ferrara",
2703 "email": "ircmaxell@php.net",
2704 "homepage": "http://blog.ircmaxell.com"
2705 }
2706 ],
2707 "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
2708 "homepage": "https://github.com/ircmaxell/password_compat",
2709 "keywords": [
2710 "hashing",
2711 "password"
2712 ],
2713 "time": "2014-11-20 16:49:30"
2714 },
2715 {
2716 "name": "j0k3r/graby", 2674 "name": "j0k3r/graby",
2717 "version": "1.0.8", 2675 "version": "1.0.8",
2718 "source": { 2676 "source": {
@@ -4572,22 +4530,22 @@
4572 }, 4530 },
4573 { 4531 {
4574 "name": "stof/doctrine-extensions-bundle", 4532 "name": "stof/doctrine-extensions-bundle",
4575 "version": "v1.2.1", 4533 "version": "dev-master",
4576 "source": { 4534 "source": {
4577 "type": "git", 4535 "type": "git",
4578 "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git", 4536 "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
4579 "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e" 4537 "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5"
4580 }, 4538 },
4581 "dist": { 4539 "dist": {
4582 "type": "zip", 4540 "type": "zip",
4583 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/7b3144572617b0555f9a443317dbc2f9cf5b524e", 4541 "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5",
4584 "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e", 4542 "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5",
4585 "shasum": "" 4543 "shasum": ""
4586 }, 4544 },
4587 "require": { 4545 "require": {
4588 "gedmo/doctrine-extensions": "^2.3.1", 4546 "gedmo/doctrine-extensions": "^2.3.1",
4589 "php": ">=5.3.2", 4547 "php": ">=5.3.2",
4590 "symfony/framework-bundle": "~2.1" 4548 "symfony/framework-bundle": "~2.1|~3.0"
4591 }, 4549 },
4592 "suggest": { 4550 "suggest": {
4593 "doctrine/doctrine-bundle": "to use the ORM extensions", 4551 "doctrine/doctrine-bundle": "to use the ORM extensions",
@@ -4629,7 +4587,7 @@
4629 "translatable", 4587 "translatable",
4630 "tree" 4588 "tree"
4631 ], 4589 ],
4632 "time": "2015-08-12 16:23:48" 4590 "time": "2015-11-26 18:29:38"
4633 }, 4591 },
4634 { 4592 {
4635 "name": "swiftmailer/swiftmailer", 4593 "name": "swiftmailer/swiftmailer",
@@ -4928,120 +4886,6 @@
4928 "time": "2015-11-20 09:19:13" 4886 "time": "2015-11-20 09:19:13"
4929 }, 4887 },
4930 { 4888 {
4931 "name": "symfony/polyfill-php54",
4932 "version": "v1.0.1",
4933 "source": {
4934 "type": "git",
4935 "url": "https://github.com/symfony/polyfill-php54.git",
4936 "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc"
4937 },
4938 "dist": {
4939 "type": "zip",
4940 "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc",
4941 "reference": "2c9f6d98eb30dc04fe0b06f9cc92a55acea5bdcc",
4942 "shasum": ""
4943 },
4944 "require": {
4945 "php": ">=5.3.3"
4946 },
4947 "type": "library",
4948 "extra": {
4949 "branch-alias": {
4950 "dev-master": "1.0-dev"
4951 }
4952 },
4953 "autoload": {
4954 "psr-4": {
4955 "Symfony\\Polyfill\\Php54\\": ""
4956 },
4957 "files": [
4958 "bootstrap.php"
4959 ],
4960 "classmap": [
4961 "Resources/stubs"
4962 ]
4963 },
4964 "notification-url": "https://packagist.org/downloads/",
4965 "license": [
4966 "MIT"
4967 ],
4968 "authors": [
4969 {
4970 "name": "Nicolas Grekas",
4971 "email": "p@tchwork.com"
4972 },
4973 {
4974 "name": "Symfony Community",
4975 "homepage": "https://symfony.com/contributors"
4976 }
4977 ],
4978 "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
4979 "homepage": "https://symfony.com",
4980 "keywords": [
4981 "compatibility",
4982 "polyfill",
4983 "portable",
4984 "shim"
4985 ],
4986 "time": "2015-11-04 20:28:58"
4987 },
4988 {
4989 "name": "symfony/polyfill-php55",
4990 "version": "v1.0.1",
4991 "source": {
4992 "type": "git",
4993 "url": "https://github.com/symfony/polyfill-php55.git",
4994 "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47"
4995 },
4996 "dist": {
4997 "type": "zip",
4998 "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/3adc962a6250c02adb508e85ecfa6fcfee9eec47",
4999 "reference": "3adc962a6250c02adb508e85ecfa6fcfee9eec47",
5000 "shasum": ""
5001 },
5002 "require": {
5003 "ircmaxell/password-compat": "~1.0",
5004 "php": ">=5.3.3"
5005 },
5006 "type": "library",
5007 "extra": {
5008 "branch-alias": {
5009 "dev-master": "1.0-dev"
5010 }
5011 },
5012 "autoload": {
5013 "psr-4": {
5014 "Symfony\\Polyfill\\Php55\\": ""
5015 },
5016 "files": [
5017 "bootstrap.php"
5018 ]
5019 },
5020 "notification-url": "https://packagist.org/downloads/",
5021 "license": [
5022 "MIT"
5023 ],
5024 "authors": [
5025 {
5026 "name": "Nicolas Grekas",
5027 "email": "p@tchwork.com"
5028 },
5029 {
5030 "name": "Symfony Community",
5031 "homepage": "https://symfony.com/contributors"
5032 }
5033 ],
5034 "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
5035 "homepage": "https://symfony.com",
5036 "keywords": [
5037 "compatibility",
5038 "polyfill",
5039 "portable",
5040 "shim"
5041 ],
5042 "time": "2015-11-04 20:28:58"
5043 },
5044 {
5045 "name": "symfony/polyfill-php56", 4889 "name": "symfony/polyfill-php56",
5046 "version": "v1.0.1", 4890 "version": "v1.0.1",
5047 "source": { 4891 "source": {
@@ -5209,78 +5053,17 @@
5209 "time": "2015-11-04 20:28:58" 5053 "time": "2015-11-04 20:28:58"
5210 }, 5054 },
5211 { 5055 {
5212 "name": "symfony/security-acl",
5213 "version": "v2.8.0",
5214 "source": {
5215 "type": "git",
5216 "url": "https://github.com/symfony/security-acl.git",
5217 "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347"
5218 },
5219 "dist": {
5220 "type": "zip",
5221 "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347",
5222 "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347",
5223 "shasum": ""
5224 },
5225 "require": {
5226 "php": ">=5.3.9",
5227 "symfony/security-core": "~2.4|~3.0.0"
5228 },
5229 "require-dev": {
5230 "doctrine/common": "~2.2",
5231 "doctrine/dbal": "~2.2",
5232 "psr/log": "~1.0",
5233 "symfony/phpunit-bridge": "~2.7|~3.0.0"
5234 },
5235 "suggest": {
5236 "doctrine/dbal": "For using the built-in ACL implementation",
5237 "symfony/class-loader": "For using the ACL generateSql script",
5238 "symfony/finder": "For using the ACL generateSql script"
5239 },
5240 "type": "library",
5241 "extra": {
5242 "branch-alias": {
5243 "dev-master": "2.8-dev"
5244 }
5245 },
5246 "autoload": {
5247 "psr-4": {
5248 "Symfony\\Component\\Security\\Acl\\": ""
5249 },
5250 "exclude-from-classmap": [
5251 "/Tests/"
5252 ]
5253 },
5254 "notification-url": "https://packagist.org/downloads/",
5255 "license": [
5256 "MIT"
5257 ],
5258 "authors": [
5259 {
5260 "name": "Fabien Potencier",
5261 "email": "fabien@symfony.com"
5262 },
5263 {
5264 "name": "Symfony Community",
5265 "homepage": "https://symfony.com/contributors"
5266 }
5267 ],
5268 "description": "Symfony Security Component - ACL (Access Control List)",
5269 "homepage": "https://symfony.com",
5270 "time": "2015-12-28 09:39:09"
5271 },
5272 {
5273 "name": "symfony/swiftmailer-bundle", 5056 "name": "symfony/swiftmailer-bundle",
5274 "version": "v2.3.9", 5057 "version": "v2.3.10",
5275 "source": { 5058 "source": {
5276 "type": "git", 5059 "type": "git",
5277 "url": "https://github.com/symfony/swiftmailer-bundle.git", 5060 "url": "https://github.com/symfony/swiftmailer-bundle.git",
5278 "reference": "3d21ada19f23631f558ad6df653b168e35362e78" 5061 "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51"
5279 }, 5062 },
5280 "dist": { 5063 "dist": {
5281 "type": "zip", 5064 "type": "zip",
5282 "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", 5065 "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
5283 "reference": "3d21ada19f23631f558ad6df653b168e35362e78", 5066 "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
5284 "shasum": "" 5067 "shasum": ""
5285 }, 5068 },
5286 "require": { 5069 "require": {
@@ -5324,34 +5107,31 @@
5324 ], 5107 ],
5325 "description": "Symfony SwiftmailerBundle", 5108 "description": "Symfony SwiftmailerBundle",
5326 "homepage": "http://symfony.com", 5109 "homepage": "http://symfony.com",
5327 "time": "2015-11-28 10:59:29" 5110 "time": "2016-01-14 10:25:38"
5328 }, 5111 },
5329 { 5112 {
5330 "name": "symfony/symfony", 5113 "name": "symfony/symfony",
5331 "version": "v2.8.2", 5114 "version": "v3.0.1",
5332 "source": { 5115 "source": {
5333 "type": "git", 5116 "type": "git",
5334 "url": "https://github.com/symfony/symfony.git", 5117 "url": "https://github.com/symfony/symfony.git",
5335 "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5" 5118 "reference": "979d7323716fec847508eac3e62d59b117612a6e"
5336 }, 5119 },
5337 "dist": { 5120 "dist": {
5338 "type": "zip", 5121 "type": "zip",
5339 "url": "https://api.github.com/repos/symfony/symfony/zipball/f3e6a82bcbea4db3b56df08e491e20a1faae82b5", 5122 "url": "https://api.github.com/repos/symfony/symfony/zipball/979d7323716fec847508eac3e62d59b117612a6e",
5340 "reference": "f3e6a82bcbea4db3b56df08e491e20a1faae82b5", 5123 "reference": "979d7323716fec847508eac3e62d59b117612a6e",
5341 "shasum": "" 5124 "shasum": ""
5342 }, 5125 },
5343 "require": { 5126 "require": {
5344 "doctrine/common": "~2.4", 5127 "doctrine/common": "~2.4",
5345 "php": ">=5.3.9", 5128 "php": ">=5.5.9",
5346 "psr/log": "~1.0", 5129 "psr/log": "~1.0",
5347 "symfony/polyfill-intl-icu": "~1.0", 5130 "symfony/polyfill-intl-icu": "~1.0",
5348 "symfony/polyfill-mbstring": "~1.0", 5131 "symfony/polyfill-mbstring": "~1.0",
5349 "symfony/polyfill-php54": "~1.0",
5350 "symfony/polyfill-php55": "~1.0",
5351 "symfony/polyfill-php56": "~1.0", 5132 "symfony/polyfill-php56": "~1.0",
5352 "symfony/polyfill-php70": "~1.0", 5133 "symfony/polyfill-php70": "~1.0",
5353 "symfony/polyfill-util": "~1.0", 5134 "symfony/polyfill-util": "~1.0",
5354 "symfony/security-acl": "~2.7",
5355 "twig/twig": "~1.23|~2.0" 5135 "twig/twig": "~1.23|~2.0"
5356 }, 5136 },
5357 "conflict": { 5137 "conflict": {
@@ -5379,7 +5159,6 @@
5379 "symfony/http-kernel": "self.version", 5159 "symfony/http-kernel": "self.version",
5380 "symfony/intl": "self.version", 5160 "symfony/intl": "self.version",
5381 "symfony/ldap": "self.version", 5161 "symfony/ldap": "self.version",
5382 "symfony/locale": "self.version",
5383 "symfony/monolog-bridge": "self.version", 5162 "symfony/monolog-bridge": "self.version",
5384 "symfony/options-resolver": "self.version", 5163 "symfony/options-resolver": "self.version",
5385 "symfony/process": "self.version", 5164 "symfony/process": "self.version",
@@ -5395,7 +5174,6 @@
5395 "symfony/security-http": "self.version", 5174 "symfony/security-http": "self.version",
5396 "symfony/serializer": "self.version", 5175 "symfony/serializer": "self.version",
5397 "symfony/stopwatch": "self.version", 5176 "symfony/stopwatch": "self.version",
5398 "symfony/swiftmailer-bridge": "self.version",
5399 "symfony/templating": "self.version", 5177 "symfony/templating": "self.version",
5400 "symfony/translation": "self.version", 5178 "symfony/translation": "self.version",
5401 "symfony/twig-bridge": "self.version", 5179 "symfony/twig-bridge": "self.version",
@@ -5408,17 +5186,18 @@
5408 "require-dev": { 5186 "require-dev": {
5409 "doctrine/data-fixtures": "1.0.*", 5187 "doctrine/data-fixtures": "1.0.*",
5410 "doctrine/dbal": "~2.4", 5188 "doctrine/dbal": "~2.4",
5411 "doctrine/doctrine-bundle": "~1.2", 5189 "doctrine/doctrine-bundle": "~1.4",
5412 "doctrine/orm": "~2.4,>=2.4.5", 5190 "doctrine/orm": "~2.4,>=2.4.5",
5413 "egulias/email-validator": "~1.2", 5191 "egulias/email-validator": "~1.2",
5414 "monolog/monolog": "~1.11", 5192 "monolog/monolog": "~1.11",
5415 "ocramius/proxy-manager": "~0.4|~1.0", 5193 "ocramius/proxy-manager": "~0.4|~1.0",
5416 "phpdocumentor/reflection": "^1.0.7" 5194 "phpdocumentor/reflection": "^1.0.7",
5195 "symfony/security-acl": "~2.8|~3.0"
5417 }, 5196 },
5418 "type": "library", 5197 "type": "library",
5419 "extra": { 5198 "extra": {
5420 "branch-alias": { 5199 "branch-alias": {
5421 "dev-master": "2.8-dev" 5200 "dev-master": "3.0-dev"
5422 } 5201 }
5423 }, 5202 },
5424 "autoload": { 5203 "autoload": {
@@ -5457,7 +5236,7 @@
5457 "keywords": [ 5236 "keywords": [
5458 "framework" 5237 "framework"
5459 ], 5238 ],
5460 "time": "2016-01-14 12:01:11" 5239 "time": "2015-12-26 16:49:48"
5461 }, 5240 },
5462 { 5241 {
5463 "name": "tecnickcom/tcpdf", 5242 "name": "tecnickcom/tcpdf",
@@ -6969,7 +6748,7 @@
6969 "prefer-stable": true, 6748 "prefer-stable": true,
6970 "prefer-lowest": false, 6749 "prefer-lowest": false,
6971 "platform": { 6750 "platform": {
6972 "php": ">=5.5.0" 6751 "php": ">=5.5.9"
6973 }, 6752 },
6974 "platform-dev": [] 6753 "platform-dev": []
6975} 6754}