aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2015-06-08 16:35:02 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2015-06-08 16:35:02 +0200
commitac9d58211e1c6676485ef15d023215e5a465f3a8 (patch)
tree8b73ad50783cf8066ec4171367e2dd1e26026636
parent82d6d9cb06a1486e2e3b05fa6ce857b3b8655180 (diff)
parent3cf22a05416b9994aa458ea045d232264006e7cf (diff)
downloadwallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.tar.gz
wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.tar.zst
wallabag-ac9d58211e1c6676485ef15d023215e5a465f3a8.zip
Merge branch 'v2' into v2-edit-title
Diffstat
-rwxr-xr-xapp/db/poche.sqlitebin393216 -> 0 bytes
l---------bin/phinx1
-rw-r--r--composer.json17
-rw-r--r--composer.lock156
-rw-r--r--migrations/20150119171459_init_database.php22
-rw-r--r--phinx.yml17
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php9
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewEntryType.php4
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/NewUserType.php4
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/RssType.php4
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/UserInformationType.php4
-rw-r--r--src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php11
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php6
13 files changed, 80 insertions, 175 deletions
diff --git a/app/db/poche.sqlite b/app/db/poche.sqlite
deleted file mode 100755
index 7ae35dd6..00000000
--- a/app/db/poche.sqlite
+++ /dev/null
Binary files differ
diff --git a/bin/phinx b/bin/phinx
deleted file mode 120000
index e78f316d..00000000
--- a/bin/phinx
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/robmorgan/phinx/bin/phinx \ No newline at end of file
diff --git a/composer.json b/composer.json
index 590e2629..5fe6eb02 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
54 ], 54 ],
55 "require": { 55 "require": {
56 "php": ">=5.3.3", 56 "php": ">=5.3.3",
57 "symfony/symfony": "2.6.*", 57 "symfony/symfony": "~2.7.0",
58 "doctrine/orm": "~2.2,>=2.2.3", 58 "doctrine/orm": "~2.2,>=2.2.3",
59 "doctrine/doctrine-bundle": "~1.2", 59 "doctrine/doctrine-bundle": "~1.2",
60 "twig/extensions": "~1.0", 60 "twig/extensions": "~1.0",
@@ -64,19 +64,18 @@
64 "sensio/distribution-bundle": "~3.0.12", 64 "sensio/distribution-bundle": "~3.0.12",
65 "sensio/framework-extra-bundle": "~3.0", 65 "sensio/framework-extra-bundle": "~3.0",
66 "incenteev/composer-parameter-handler": "~2.0", 66 "incenteev/composer-parameter-handler": "~2.0",
67 "nelmio/cors-bundle": "1.3.*@dev", 67 "nelmio/cors-bundle": "~1.4.0",
68 "umpirsky/twig-gettext-extractor": "1.1.*", 68 "umpirsky/twig-gettext-extractor": "~1.1.5",
69 "friendsofsymfony/rest-bundle": "~1.4", 69 "friendsofsymfony/rest-bundle": "~1.4",
70 "jms/serializer-bundle": "~0.13", 70 "jms/serializer-bundle": "~0.13",
71 "nelmio/api-doc-bundle": "~2.7", 71 "nelmio/api-doc-bundle": "~2.7",
72 "ezyang/htmlpurifier": "~4.6", 72 "ezyang/htmlpurifier": "~4.6",
73 "mgargano/simplehtmldom": "~1.5", 73 "mgargano/simplehtmldom": "~1.5",
74 "robmorgan/phinx": "~0.4",
75 "tecnick.com/tcpdf": "~6.2", 74 "tecnick.com/tcpdf": "~6.2",
76 "simplepie/simplepie": "~1.3.1", 75 "simplepie/simplepie": "~1.3.1",
77 "willdurand/hateoas-bundle": "1.0.*@dev", 76 "willdurand/hateoas-bundle": "~0.5.0",
78 "htmlawed/htmlawed": "dev-master", 77 "htmlawed/htmlawed": "~1.1.19",
79 "liip/theme-bundle": "1.1.3", 78 "liip/theme-bundle": "~1.1.3",
80 "wallabag/PHP-Flash-Messages": "dev-master", 79 "wallabag/PHP-Flash-Messages": "dev-master",
81 "wallabag/kriss_php5": "dev-master", 80 "wallabag/kriss_php5": "dev-master",
82 "wallabag/pagination": "dev-master", 81 "wallabag/pagination": "dev-master",
@@ -84,10 +83,10 @@
84 "wallabag/php-readability": "dev-master", 83 "wallabag/php-readability": "dev-master",
85 "wallabag/phpMobi": "dev-master", 84 "wallabag/phpMobi": "dev-master",
86 "wallabag/Fivefilters_Libraries": "dev-master", 85 "wallabag/Fivefilters_Libraries": "dev-master",
87 "pagerfanta/pagerfanta": "~1.0@dev" 86 "pagerfanta/pagerfanta": "~1.0.3"
88 }, 87 },
89 "require-dev": { 88 "require-dev": {
90 "doctrine/doctrine-fixtures-bundle": "dev-master", 89 "doctrine/doctrine-fixtures-bundle": "~2.2.0",
91 "sensio/generator-bundle": "~2.5", 90 "sensio/generator-bundle": "~2.5",
92 "phpunit/phpunit": "~4.4" 91 "phpunit/phpunit": "~4.4"
93 }, 92 },
diff --git a/composer.lock b/composer.lock
index d32f0980..a5620bb1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at http://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": "43d869c37ae73d7b74d3f77c4028bf9c", 7 "hash": "d7869b0dce6699d8f4916e675a4209a8",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "doctrine/annotations", 10 "name": "doctrine/annotations",
@@ -898,16 +898,16 @@
898 }, 898 },
899 { 899 {
900 "name": "htmlawed/htmlawed", 900 "name": "htmlawed/htmlawed",
901 "version": "dev-master", 901 "version": "1.1.19",
902 "source": { 902 "source": {
903 "type": "git", 903 "type": "git",
904 "url": "https://github.com/kesar/HTMLawed.git", 904 "url": "https://github.com/kesar/HTMLawed.git",
905 "reference": "f842e793614bdf3af70a62b1e70570e824dc9ab6" 905 "reference": "620c38edd57e680260ebd8dd0e98167d97e9a7bf"
906 }, 906 },
907 "dist": { 907 "dist": {
908 "type": "zip", 908 "type": "zip",
909 "url": "https://api.github.com/repos/kesar/HTMLawed/zipball/f842e793614bdf3af70a62b1e70570e824dc9ab6", 909 "url": "https://api.github.com/repos/kesar/HTMLawed/zipball/620c38edd57e680260ebd8dd0e98167d97e9a7bf",
910 "reference": "f842e793614bdf3af70a62b1e70570e824dc9ab6", 910 "reference": "620c38edd57e680260ebd8dd0e98167d97e9a7bf",
911 "shasum": "" 911 "shasum": ""
912 }, 912 },
913 "require": { 913 "require": {
@@ -931,7 +931,7 @@
931 "role": "Developer" 931 "role": "Developer"
932 } 932 }
933 ], 933 ],
934 "description": "htmLawed - Process text with HTML markup to make it more compliant with HTML standards and administrative policies", 934 "description": "htmLawed - Process text with HTML markup to make it more compliant with HTML standards and administrative policies",
935 "homepage": "http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/", 935 "homepage": "http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/",
936 "keywords": [ 936 "keywords": [
937 "HTMLtidy", 937 "HTMLtidy",
@@ -940,7 +940,7 @@
940 "strip", 940 "strip",
941 "tags" 941 "tags"
942 ], 942 ],
943 "time": "2015-04-12 19:37:20" 943 "time": "2015-04-05 17:23:05"
944 }, 944 },
945 { 945 {
946 "name": "incenteev/composer-parameter-handler", 946 "name": "incenteev/composer-parameter-handler",
@@ -1651,17 +1651,17 @@
1651 }, 1651 },
1652 { 1652 {
1653 "name": "nelmio/cors-bundle", 1653 "name": "nelmio/cors-bundle",
1654 "version": "1.3.3", 1654 "version": "1.4.0",
1655 "target-dir": "Nelmio/CorsBundle", 1655 "target-dir": "Nelmio/CorsBundle",
1656 "source": { 1656 "source": {
1657 "type": "git", 1657 "type": "git",
1658 "url": "https://github.com/nelmio/NelmioCorsBundle.git", 1658 "url": "https://github.com/nelmio/NelmioCorsBundle.git",
1659 "reference": "d482c01f6ca0840025b81b65534d0ffb7c18f425" 1659 "reference": "553b4c5cdb3ff155f910e8f6e3e0806d42c763a6"
1660 }, 1660 },
1661 "dist": { 1661 "dist": {
1662 "type": "zip", 1662 "type": "zip",
1663 "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/d482c01f6ca0840025b81b65534d0ffb7c18f425", 1663 "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/553b4c5cdb3ff155f910e8f6e3e0806d42c763a6",
1664 "reference": "d482c01f6ca0840025b81b65534d0ffb7c18f425", 1664 "reference": "553b4c5cdb3ff155f910e8f6e3e0806d42c763a6",
1665 "shasum": "" 1665 "shasum": ""
1666 }, 1666 },
1667 "require": { 1667 "require": {
@@ -1702,7 +1702,7 @@
1702 "cors", 1702 "cors",
1703 "crossdomain" 1703 "crossdomain"
1704 ], 1704 ],
1705 "time": "2014-12-10 17:26:49" 1705 "time": "2015-01-13 17:53:27"
1706 }, 1706 },
1707 { 1707 {
1708 "name": "pagerfanta/pagerfanta", 1708 "name": "pagerfanta/pagerfanta",
@@ -1909,68 +1909,6 @@
1909 "time": "2012-12-21 11:40:51" 1909 "time": "2012-12-21 11:40:51"
1910 }, 1910 },
1911 { 1911 {
1912 "name": "robmorgan/phinx",
1913 "version": "v0.4.3",
1914 "source": {
1915 "type": "git",
1916 "url": "https://github.com/robmorgan/phinx.git",
1917 "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4"
1918 },
1919 "dist": {
1920 "type": "zip",
1921 "url": "https://api.github.com/repos/robmorgan/phinx/zipball/0d1f9cb9939f65f506a8a3f5fee356764c310fd4",
1922 "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4",
1923 "shasum": ""
1924 },
1925 "require": {
1926 "php": ">=5.3.2",
1927 "symfony/config": "~2.6.0",
1928 "symfony/console": "~2.6.0",
1929 "symfony/yaml": "~2.6.0"
1930 },
1931 "require-dev": {
1932 "phpunit/phpunit": "3.7.*",
1933 "squizlabs/php_codesniffer": "dev-phpcs-fixer"
1934 },
1935 "bin": [
1936 "bin/phinx"
1937 ],
1938 "type": "library",
1939 "autoload": {
1940 "psr-4": {
1941 "Phinx\\": "src/Phinx"
1942 }
1943 },
1944 "notification-url": "https://packagist.org/downloads/",
1945 "license": [
1946 "MIT"
1947 ],
1948 "authors": [
1949 {
1950 "name": "Rob Morgan",
1951 "email": "robbym@gmail.com",
1952 "homepage": "http://robmorgan.id.au",
1953 "role": "Lead Developer"
1954 },
1955 {
1956 "name": "Woody Gilk",
1957 "email": "woody.gilk@gmail.com",
1958 "homepage": "http://shadowhand.me",
1959 "role": "Developer"
1960 }
1961 ],
1962 "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.",
1963 "homepage": "https://phinx.org",
1964 "keywords": [
1965 "database",
1966 "database migrations",
1967 "db",
1968 "migrations",
1969 "phinx"
1970 ],
1971 "time": "2015-02-23 16:38:12"
1972 },
1973 {
1974 "name": "sensio/distribution-bundle", 1912 "name": "sensio/distribution-bundle",
1975 "version": "v3.0.28", 1913 "version": "v3.0.28",
1976 "target-dir": "Sensio/Bundle/DistributionBundle", 1914 "target-dir": "Sensio/Bundle/DistributionBundle",
@@ -2419,25 +2357,26 @@
2419 }, 2357 },
2420 { 2358 {
2421 "name": "symfony/symfony", 2359 "name": "symfony/symfony",
2422 "version": "v2.6.9", 2360 "version": "v2.7.0",
2423 "source": { 2361 "source": {
2424 "type": "git", 2362 "type": "git",
2425 "url": "https://github.com/symfony/symfony.git", 2363 "url": "https://github.com/symfony/symfony.git",
2426 "reference": "b06539573ccf64dd3a62852685f052553d02c5ba" 2364 "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46"
2427 }, 2365 },
2428 "dist": { 2366 "dist": {
2429 "type": "zip", 2367 "type": "zip",
2430 "url": "https://api.github.com/repos/symfony/symfony/zipball/b06539573ccf64dd3a62852685f052553d02c5ba", 2368 "url": "https://api.github.com/repos/symfony/symfony/zipball/9975b1eca3de4db792a2c3e4e16f676a4aadcd46",
2431 "reference": "b06539573ccf64dd3a62852685f052553d02c5ba", 2369 "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46",
2432 "shasum": "" 2370 "shasum": ""
2433 }, 2371 },
2434 "require": { 2372 "require": {
2435 "doctrine/common": "~2.3", 2373 "doctrine/common": "~2.3",
2436 "php": ">=5.3.3", 2374 "php": ">=5.3.9",
2437 "psr/log": "~1.0", 2375 "psr/log": "~1.0",
2438 "twig/twig": "~1.12,>=1.12.3" 2376 "twig/twig": "~1.18"
2439 }, 2377 },
2440 "replace": { 2378 "replace": {
2379 "symfony/asset": "self.version",
2441 "symfony/browser-kit": "self.version", 2380 "symfony/browser-kit": "self.version",
2442 "symfony/class-loader": "self.version", 2381 "symfony/class-loader": "self.version",
2443 "symfony/config": "self.version", 2382 "symfony/config": "self.version",
@@ -2461,7 +2400,6 @@
2461 "symfony/monolog-bridge": "self.version", 2400 "symfony/monolog-bridge": "self.version",
2462 "symfony/options-resolver": "self.version", 2401 "symfony/options-resolver": "self.version",
2463 "symfony/process": "self.version", 2402 "symfony/process": "self.version",
2464 "symfony/propel1-bridge": "self.version",
2465 "symfony/property-access": "self.version", 2403 "symfony/property-access": "self.version",
2466 "symfony/proxy-manager-bridge": "self.version", 2404 "symfony/proxy-manager-bridge": "self.version",
2467 "symfony/routing": "self.version", 2405 "symfony/routing": "self.version",
@@ -2492,18 +2430,23 @@
2492 "ircmaxell/password-compat": "~1.0", 2430 "ircmaxell/password-compat": "~1.0",
2493 "monolog/monolog": "~1.11", 2431 "monolog/monolog": "~1.11",
2494 "ocramius/proxy-manager": "~0.4|~1.0", 2432 "ocramius/proxy-manager": "~0.4|~1.0",
2495 "propel/propel1": "~1.6", 2433 "symfony/phpunit-bridge": "self.version"
2496 "symfony/phpunit-bridge": "~2.7"
2497 }, 2434 },
2498 "type": "library", 2435 "type": "library",
2499 "extra": { 2436 "extra": {
2500 "branch-alias": { 2437 "branch-alias": {
2501 "dev-master": "2.6-dev" 2438 "dev-master": "2.7-dev"
2502 } 2439 }
2503 }, 2440 },
2504 "autoload": { 2441 "autoload": {
2505 "psr-0": { 2442 "psr-4": {
2506 "Symfony\\": "src/" 2443 "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
2444 "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
2445 "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
2446 "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
2447 "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
2448 "Symfony\\Bundle\\": "src/Symfony/Bundle/",
2449 "Symfony\\Component\\": "src/Symfony/Component/"
2507 }, 2450 },
2508 "classmap": [ 2451 "classmap": [
2509 "src/Symfony/Component/HttpFoundation/Resources/stubs", 2452 "src/Symfony/Component/HttpFoundation/Resources/stubs",
@@ -2532,7 +2475,7 @@
2532 "keywords": [ 2475 "keywords": [
2533 "framework" 2476 "framework"
2534 ], 2477 ],
2535 "time": "2015-05-29 22:55:07" 2478 "time": "2015-05-30 16:52:28"
2536 }, 2479 },
2537 { 2480 {
2538 "name": "tecnick.com/tcpdf", 2481 "name": "tecnick.com/tcpdf",
@@ -3108,17 +3051,17 @@
3108 }, 3051 },
3109 { 3052 {
3110 "name": "willdurand/hateoas-bundle", 3053 "name": "willdurand/hateoas-bundle",
3111 "version": "dev-master", 3054 "version": "0.5.0",
3112 "target-dir": "Bazinga/Bundle/HateoasBundle", 3055 "target-dir": "Bazinga/Bundle/HateoasBundle",
3113 "source": { 3056 "source": {
3114 "type": "git", 3057 "type": "git",
3115 "url": "https://github.com/willdurand/BazingaHateoasBundle.git", 3058 "url": "https://github.com/willdurand/BazingaHateoasBundle.git",
3116 "reference": "a99f48ea5004a89ecf0927229d9c912fed9fa4ab" 3059 "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b"
3117 }, 3060 },
3118 "dist": { 3061 "dist": {
3119 "type": "zip", 3062 "type": "zip",
3120 "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/a99f48ea5004a89ecf0927229d9c912fed9fa4ab", 3063 "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/3c86e8080e8a229365a0ce91818da6fe6562376b",
3121 "reference": "a99f48ea5004a89ecf0927229d9c912fed9fa4ab", 3064 "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b",
3122 "shasum": "" 3065 "shasum": ""
3123 }, 3066 },
3124 "require": { 3067 "require": {
@@ -3156,7 +3099,7 @@
3156 "HATEOAS", 3099 "HATEOAS",
3157 "rest" 3100 "rest"
3158 ], 3101 ],
3159 "time": "2015-03-12 15:49:24" 3102 "time": "2015-02-19 16:27:51"
3160 }, 3103 },
3161 { 3104 {
3162 "name": "willdurand/jsonp-callback-validator", 3105 "name": "willdurand/jsonp-callback-validator",
@@ -3308,17 +3251,17 @@
3308 }, 3251 },
3309 { 3252 {
3310 "name": "doctrine/doctrine-fixtures-bundle", 3253 "name": "doctrine/doctrine-fixtures-bundle",
3311 "version": "dev-master", 3254 "version": "v2.2.0",
3312 "target-dir": "Doctrine/Bundle/FixturesBundle", 3255 "target-dir": "Doctrine/Bundle/FixturesBundle",
3313 "source": { 3256 "source": {
3314 "type": "git", 3257 "type": "git",
3315 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", 3258 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
3316 "reference": "c5ff0542772102ddd4e2fbe173e9ad40ad67c22f" 3259 "reference": "c811f96f0cf83b997e3a3ed037cac729bbe3e803"
3317 }, 3260 },
3318 "dist": { 3261 "dist": {
3319 "type": "zip", 3262 "type": "zip",
3320 "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c5ff0542772102ddd4e2fbe173e9ad40ad67c22f", 3263 "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c811f96f0cf83b997e3a3ed037cac729bbe3e803",
3321 "reference": "c5ff0542772102ddd4e2fbe173e9ad40ad67c22f", 3264 "reference": "c811f96f0cf83b997e3a3ed037cac729bbe3e803",
3322 "shasum": "" 3265 "shasum": ""
3323 }, 3266 },
3324 "require": { 3267 "require": {
@@ -3330,7 +3273,7 @@
3330 "type": "symfony-bundle", 3273 "type": "symfony-bundle",
3331 "extra": { 3274 "extra": {
3332 "branch-alias": { 3275 "branch-alias": {
3333 "dev-master": "2.2.x-dev" 3276 "dev-master": "2.1.x-dev"
3334 } 3277 }
3335 }, 3278 },
3336 "autoload": { 3279 "autoload": {
@@ -3344,16 +3287,18 @@
3344 ], 3287 ],
3345 "authors": [ 3288 "authors": [
3346 { 3289 {
3290 "name": "Fabien Potencier",
3291 "email": "fabien@symfony.com",
3292 "homepage": "http://fabien.potencier.org",
3293 "role": "Lead Developer"
3294 },
3295 {
3347 "name": "Symfony Community", 3296 "name": "Symfony Community",
3348 "homepage": "http://symfony.com/contributors" 3297 "homepage": "http://symfony.com/contributors"
3349 }, 3298 },
3350 { 3299 {
3351 "name": "Doctrine Project", 3300 "name": "Doctrine Project",
3352 "homepage": "http://www.doctrine-project.org" 3301 "homepage": "http://www.doctrine-project.org"
3353 },
3354 {
3355 "name": "Fabien Potencier",
3356 "email": "fabien@symfony.com"
3357 } 3302 }
3358 ], 3303 ],
3359 "description": "Symfony DoctrineFixturesBundle", 3304 "description": "Symfony DoctrineFixturesBundle",
@@ -3362,7 +3307,7 @@
3362 "Fixture", 3307 "Fixture",
3363 "persistence" 3308 "persistence"
3364 ], 3309 ],
3365 "time": "2015-01-19 02:21:37" 3310 "time": "2013-09-05 11:23:37"
3366 }, 3311 },
3367 { 3312 {
3368 "name": "phpdocumentor/reflection-docblock", 3313 "name": "phpdocumentor/reflection-docblock",
@@ -4269,18 +4214,13 @@
4269 "aliases": [], 4214 "aliases": [],
4270 "minimum-stability": "dev", 4215 "minimum-stability": "dev",
4271 "stability-flags": { 4216 "stability-flags": {
4272 "nelmio/cors-bundle": 20,
4273 "willdurand/hateoas-bundle": 20,
4274 "htmlawed/htmlawed": 20,
4275 "wallabag/php-flash-messages": 20, 4217 "wallabag/php-flash-messages": 20,
4276 "wallabag/kriss_php5": 20, 4218 "wallabag/kriss_php5": 20,
4277 "wallabag/pagination": 20, 4219 "wallabag/pagination": 20,
4278 "wallabag/phpepub": 20, 4220 "wallabag/phpepub": 20,
4279 "wallabag/php-readability": 20, 4221 "wallabag/php-readability": 20,
4280 "wallabag/phpmobi": 20, 4222 "wallabag/phpmobi": 20,
4281 "wallabag/fivefilters_libraries": 20, 4223 "wallabag/fivefilters_libraries": 20
4282 "pagerfanta/pagerfanta": 20,
4283 "doctrine/doctrine-fixtures-bundle": 20
4284 }, 4224 },
4285 "prefer-stable": true, 4225 "prefer-stable": true,
4286 "prefer-lowest": false, 4226 "prefer-lowest": false,
diff --git a/migrations/20150119171459_init_database.php b/migrations/20150119171459_init_database.php
deleted file mode 100644
index 35fc9e07..00000000
--- a/migrations/20150119171459_init_database.php
+++ /dev/null
@@ -1,22 +0,0 @@
1<?php
2
3use Phinx\Migration\AbstractMigration;
4
5class InitDatabase extends AbstractMigration
6{
7 /**
8 * Migrate Up.
9 */
10 public function up()
11 {
12 $this->execute("INSERT INTO config (name, value) VALUES ('foo', 'bar');");
13 }
14
15 /**
16 * Migrate Down.
17 */
18 public function down()
19 {
20 $this->execute("DELETE FROM config WHERE name = 'foo' AND value = 'bar';");
21 }
22} \ No newline at end of file
diff --git a/phinx.yml b/phinx.yml
deleted file mode 100644
index 26869443..00000000
--- a/phinx.yml
+++ /dev/null
@@ -1,17 +0,0 @@
1paths:
2 migrations: %%PHINX_CONFIG_DIR%%/migrations
3
4environments:
5 default_migration_table: phinxlog
6 default_database: development
7 production:
8 adapter: sqlite
9 name: app/db/poche
10
11 development:
12 adapter: sqlite
13 name: app/db/poche
14
15 testing:
16 adapter: sqlite
17 name: app/db/poche
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index d5890971..49b05b80 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 6use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolverInterface; 7use Symfony\Component\OptionsResolver\OptionsResolver;
8 8
9class ConfigType extends AbstractType 9class ConfigType extends AbstractType
10{ 10{
@@ -24,14 +24,17 @@ class ConfigType extends AbstractType
24 public function buildForm(FormBuilderInterface $builder, array $options) 24 public function buildForm(FormBuilderInterface $builder, array $options)
25 { 25 {
26 $builder 26 $builder
27 ->add('theme', 'choice', array('choices' => $this->themes)) 27 ->add('theme', 'choice', array(
28 'choices' => array_flip($this->themes),
29 'choices_as_values' => true,
30 ))
28 ->add('items_per_page') 31 ->add('items_per_page')
29 ->add('language') 32 ->add('language')
30 ->add('save', 'submit') 33 ->add('save', 'submit')
31 ; 34 ;
32 } 35 }
33 36
34 public function setDefaultOptions(OptionsResolverInterface $resolver) 37 public function configureOptions(OptionsResolver $resolver)
35 { 38 {
36 $resolver->setDefaults(array( 39 $resolver->setDefaults(array(
37 'data_class' => 'Wallabag\CoreBundle\Entity\Config', 40 'data_class' => 'Wallabag\CoreBundle\Entity\Config',
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
index a2d203ea..cb96d11a 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 6use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolverInterface; 7use Symfony\Component\OptionsResolver\OptionsResolver;
8 8
9class NewEntryType extends AbstractType 9class NewEntryType extends AbstractType
10{ 10{
@@ -16,7 +16,7 @@ class NewEntryType extends AbstractType
16 ; 16 ;
17 } 17 }
18 18
19 public function setDefaultOptions(OptionsResolverInterface $resolver) 19 public function configureOptions(OptionsResolver $resolver)
20 { 20 {
21 $resolver->setDefaults(array( 21 $resolver->setDefaults(array(
22 'data_class' => 'Wallabag\CoreBundle\Entity\Entry', 22 'data_class' => 'Wallabag\CoreBundle\Entity\Entry',
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index a12fff2b..985cb55b 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 6use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolverInterface; 7use Symfony\Component\OptionsResolver\OptionsResolver;
8use Symfony\Component\Validator\Constraints; 8use Symfony\Component\Validator\Constraints;
9 9
10class NewUserType extends AbstractType 10class NewUserType extends AbstractType
@@ -27,7 +27,7 @@ class NewUserType extends AbstractType
27 ; 27 ;
28 } 28 }
29 29
30 public function setDefaultOptions(OptionsResolverInterface $resolver) 30 public function configureOptions(OptionsResolver $resolver)
31 { 31 {
32 $resolver->setDefaults(array( 32 $resolver->setDefaults(array(
33 'data_class' => 'Wallabag\CoreBundle\Entity\User', 33 'data_class' => 'Wallabag\CoreBundle\Entity\User',
diff --git a/src/Wallabag/CoreBundle/Form/Type/RssType.php b/src/Wallabag/CoreBundle/Form/Type/RssType.php
index e14e84e1..1f7f4c68 100644
--- a/src/Wallabag/CoreBundle/Form/Type/RssType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/RssType.php
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 6use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolverInterface; 7use Symfony\Component\OptionsResolver\OptionsResolver;
8 8
9class RssType extends AbstractType 9class RssType extends AbstractType
10{ 10{
@@ -16,7 +16,7 @@ class RssType extends AbstractType
16 ; 16 ;
17 } 17 }
18 18
19 public function setDefaultOptions(OptionsResolverInterface $resolver) 19 public function configureOptions(OptionsResolver $resolver)
20 { 20 {
21 $resolver->setDefaults(array( 21 $resolver->setDefaults(array(
22 'data_class' => 'Wallabag\CoreBundle\Entity\Config', 22 'data_class' => 'Wallabag\CoreBundle\Entity\Config',
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index f0367d14..1b628051 100644
--- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\FormBuilderInterface; 6use Symfony\Component\Form\FormBuilderInterface;
7use Symfony\Component\OptionsResolver\OptionsResolverInterface; 7use Symfony\Component\OptionsResolver\OptionsResolver;
8 8
9class UserInformationType extends AbstractType 9class UserInformationType extends AbstractType
10{ 10{
@@ -17,7 +17,7 @@ class UserInformationType extends AbstractType
17 ; 17 ;
18 } 18 }
19 19
20 public function setDefaultOptions(OptionsResolverInterface $resolver) 20 public function configureOptions(OptionsResolver $resolver)
21 { 21 {
22 $resolver->setDefaults(array( 22 $resolver->setDefaults(array(
23 'data_class' => 'Wallabag\CoreBundle\Entity\User', 23 'data_class' => 'Wallabag\CoreBundle\Entity\User',
diff --git a/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php b/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php
index 5586f976..52062773 100644
--- a/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php
+++ b/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php
@@ -3,7 +3,7 @@
3namespace Wallabag\CoreBundle\Security\Validator; 3namespace Wallabag\CoreBundle\Security\Validator;
4 4
5use Symfony\Component\Security\Core\User\UserInterface; 5use Symfony\Component\Security\Core\User\UserInterface;
6use Symfony\Component\Security\Core\SecurityContextInterface; 6use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
7use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; 7use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
8use Symfony\Component\Validator\Constraint; 8use Symfony\Component\Validator\Constraint;
9use Symfony\Component\Validator\ConstraintValidator; 9use Symfony\Component\Validator\ConstraintValidator;
@@ -11,14 +11,17 @@ use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
11use Symfony\Component\Validator\Exception\UnexpectedTypeException; 11use Symfony\Component\Validator\Exception\UnexpectedTypeException;
12use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; 12use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
13 13
14/**
15 * @see Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator
16 */
14class WallabagUserPasswordValidator extends ConstraintValidator 17class WallabagUserPasswordValidator extends ConstraintValidator
15{ 18{
16 private $securityContext; 19 private $securityContext;
17 private $encoderFactory; 20 private $encoderFactory;
18 21
19 public function __construct(SecurityContextInterface $securityContext, EncoderFactoryInterface $encoderFactory) 22 public function __construct(TokenStorageInterface $tokenStorage, EncoderFactoryInterface $encoderFactory)
20 { 23 {
21 $this->securityContext = $securityContext; 24 $this->tokenStorage = $tokenStorage;
22 $this->encoderFactory = $encoderFactory; 25 $this->encoderFactory = $encoderFactory;
23 } 26 }
24 27
@@ -31,7 +34,7 @@ class WallabagUserPasswordValidator extends ConstraintValidator
31 throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UserPassword'); 34 throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UserPassword');
32 } 35 }
33 36
34 $user = $this->securityContext->getToken()->getUser(); 37 $user = $this->tokenStorage->getToken()->getUser();
35 38
36 if (!$user instanceof UserInterface) { 39 if (!$user instanceof UserInterface) {
37 throw new ConstraintDefinitionException('The User object must implement the UserInterface interface.'); 40 throw new ConstraintDefinitionException('The User object must implement the UserInterface interface.');
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index a0145780..f72cba65 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -44,7 +44,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
44 $form = $crawler->filter('button[id=config_save]')->form(); 44 $form = $crawler->filter('button[id=config_save]')->form();
45 45
46 $data = array( 46 $data = array(
47 'config[theme]' => 'baggy', 47 'config[theme]' => 0,
48 'config[items_per_page]' => '30', 48 'config[items_per_page]' => '30',
49 'config[language]' => 'fr_FR', 49 'config[language]' => 'fr_FR',
50 ); 50 );
@@ -63,12 +63,12 @@ class ConfigControllerTest extends WallabagCoreTestCase
63 { 63 {
64 return array( 64 return array(
65 array(array( 65 array(array(
66 'config[theme]' => 'baggy', 66 'config[theme]' => 0,
67 'config[items_per_page]' => '', 67 'config[items_per_page]' => '',
68 'config[language]' => 'fr_FR', 68 'config[language]' => 'fr_FR',
69 )), 69 )),
70 array(array( 70 array(array(
71 'config[theme]' => 'baggy', 71 'config[theme]' => 0,
72 'config[items_per_page]' => '12', 72 'config[items_per_page]' => '12',
73 'config[language]' => '', 73 'config[language]' => '',
74 )), 74 )),
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 12:01:29 +0000