From 170746f99d7e0bea2eb08ccf6015fe0384d45b00 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 2 Jun 2015 16:54:52 +0200 Subject: [PATCH 1/2] Remove phinx Doctrine handle quite correctly database migration. Thanks to `doctrine:schema:update` --- app/db/poche.sqlite | Bin 393216 -> 0 bytes bin/phinx | 1 - migrations/20150119171459_init_database.php | 22 -------------------- phinx.yml | 17 --------------- 4 files changed, 40 deletions(-) delete mode 100755 app/db/poche.sqlite delete mode 120000 bin/phinx delete mode 100644 migrations/20150119171459_init_database.php delete mode 100644 phinx.yml diff --git a/app/db/poche.sqlite b/app/db/poche.sqlite deleted file mode 100755 index 7ae35dd6835ec8ba7f26794ad8b6e5b8d84de544..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393216 zcmeI*Pi!1#n%{A9q_r)1wB95b2!q7{HC#+W?XcM*_1~5`LsOJ2o1!!lWsfEZgkpDf zv!w2>c2yTCYQ`gb5gVNg0zo~By*FWg%^u+fs`Bukh{MWD`UR%C-C;D*pPPBY`l>)eQovT)s?wu5ciX4WA(=ybJ2F(E5r9E zcHVsb`0?Y@pI_T=fFJ+p^QZjsb4?t67#GD(mba_3P5dV5$7#=BKJoeD(btdv?(a_j z!8?BDioN>s`hl}oFTVWzqjc1(udU3(3Fe}-xSJ>OSU_EQdHMF*Ms(7D)rq%jo5|k@ zf28w8@2y>b?>WR1pLVBCeT|W?w;%re&10`0|JJvrKi?e>9t(_b9JoSz<^TC0+3)53 zc>6oQ{o3(&zBN6S4%*3s;**~Kuhj3x(EOS3;!HFnz$rF$M$<%M}xBvS`UOWDSZ@;Wzp(F1uhObAy z|HfB%^Fny@8#+hl(Z8E&?w{+ceD`(6la6=znEsi5^xvoSmp=#~fB*srAb`EgO?@{TCW9g? z^Hy?HS3dpd&!_a4KL{Xz00IagfB*srAbj@gxe z_6lA;my7@c2q1s}0tg_000IagfB*srAbK{!#{Leclul~``|99&@O#G5>5kLR|1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~fmcr8KfQJ6&8hC^fA@_yKL1z!BbW2IA8*Fpxu_gOgRI<6 z;xa0dd^>F=Q7_%hlPDQQ-8>$Z>1b;-8ou3Z?(FQ$cl>j`tUI6O-DWyyClBU_Tf^os zD@M)5lMAPtCl{M1&ot}fH>zVc{FsgEfQ@u8vU4Rnjdrq~^s?bFDf6Qjw-%Rf50Ys7 z+o+vH>uD?N#l>7yWP_-^_hkI``HM}x|LDcx(#52|bhQ`hliOKYL~&H?{W?$j$zT)> z<09I7(%OoL!@VcbCuO3G9qHm)*`Ub!{dknxQT^vpGSG+HW%O~f870LiQWNuZvlkB3 z+RC#*Hr$H4E;EetQQ9hd>E0LBnL2q{jPh6)7LBrU6zx5ZdU4dr(&Fjkw{_Nmc+2Ww z0xzs-x}+l76n!fzhtcdP&xTJQ|KNl*Xq5DaMU)KG8C_kNj+Q(a_Od+5qh3-({dAyz z<1$Y>)&jL#-4^T2X)l?Jb`5Hjv_@)9qzfOWBfUi(+DUslRln1v zMO|mrh^#`kr~cKb5uW4`lHjcL6GJihr^yww)UR*sCxEdi!$BT zl`57L`*DBMEL};63OI#qE7iFyAeA|M6!enceD=o|H}j~ubg`+Sc(FMg56c_YJ>CoL zY%mb`rhW0@*U}MN3ReHE22MAz(NMJVa;R}q79nJGl75^klo~@Ddg=~uz6YItr(P`@ z?W`zL9oqs&LEFmu!z|Z0RJh$!I~UKKt;0A(2SL66uogTQBEzCd6SkdT2ZXe6q$vAK5oa@R#b^NFQ{OM!Y8+Xpr$4`H4?Ji=a1!J;QY5gM( zMW#Atm?`w#eUPc?I@3Ux?U}YvKJ^dl>zw6PqtSai*0!kZSwH9))y%N%GfqEEdQTs} zQ^$nTe$PIs@es1Hb$?ze3)yw4Et1xx7`1g_HmRs<_I|0EO(#;G^--zTwt5Q4Xx17S z_m$F>^S4qRp|7{uK^)vB4&_Qkh^PH~b_heQW820{t`A$jHrA1v;RC#%>1}oxOTqS= zzOtlGJUvC^D7J4yvlL&NA9AG!UGz8$ov;h^WLzDlO2I>As9ae@M^LzGY+AlaJ#H=5 zY>uIMzJ*fZb7ru}wle=-m0Fy0lIPj?nPHlyjF795H> zB^Je@UTdcwIrGsio4$-d(|tvt(PurbETE(n=8u5~SDtm$<9QgwSs4jPzgHKv^1UxK zU)Y-zZ5F|5yMk4gv3;pRywSILw3^{Ud{!UnXFg>r(lr(=Xl10y+NL8-q4z9fDjJpW zy)W#LRbf@A_XE{HGr2Wa8GTL}LF2*NbHWF|rUwP2hiR3vbpV?<6$_RZe2}cG*wdL6 zf)Arhsq#jqG@?^06(yE+bfMdtfbHCBOxj9EJ{ReXmgId#(+s2ethy#8QyGRjpgQ*7 zj{C!RqDvZL77CuDOM6o<+13!O&pIEiD&}-Pi&UGmtyvZgLQw_j1&c&={PkPQ>I5ZZ z@1Ia9)H2?7PaQUpl!Sj}t{PUB-b2-5dC`-3h;BuejWtz9CSe(+P*N37k>(*khchT7 zvYvOUns6f?Ecc^XIq6_ZPHLsiuRaTht{Yl#+Zc{|dynT-gDC-f-zZ(4c*(rEW_C7H zdhb{mSPCn`%sEO&r2<8lqGV-pkjY&jDyB;7b9IpBH${tbqr%F^va-F*bG`9k3iM=R z*;S$5@>o$ymea)9HIIcVz`MiFWtm5LA>aGg`c5a-nqj{sK8Ms*wg;^hEK0{pB?CLq ze6*q?S%qEI_R-p({Gv?t8^v2I)sjH7kqF1jfW0SkKDS%)+x7CvMuYO1f+Ms!lqtFv zg=Hv^{JJc#lX6SWnzhooX#C>Gaj$2~pZS;Y`|_p8I$kzv^0RSmS6_yT+B#TQqZTTQ z=zQCW+Na+?TONMJ71KiV)I#%0l6WDhBB|Y|+xKh{sdM&}(_$N>c}q216}UxM1o%L- zpx#pOs-wJflovwTISP$bm1*``u@ydf+l48OjYOiLQmqlPl*d9V8(P{(qPjtzHSE$o zhg*F=N?wMzrYx2yRzt+;AY;|J5H4DBDpiJRD~vLmclAbJ#@QJ%ONch}#69I*4NFn0 zI8Qf~&*D+8#j0{$Rb@T@!C4!wy0liF4!vr&$vsxb_YzBsQQT_nePOGp&@x{Rd-R7y zu9kOJk;7sht?rfeYjdW*!Co5lbyey z6^PbE;RxY!bctC*v9p=v-SM1NUt`soE1J2hnIf!(eNmwzSnJd1n(C_LVZ+A0wd>_k zuK{*oo8Z}S4(+M;3hF4`%7!lssqj{<6D=d&idFvAImE{JMroP;fvO-c<9yoJibJKw z7u$ZJYWxcZydUT3MEi4R2kT`S=FEFiGkwQqFv?Lz?Q8ZU`omA937%M%_%$3_&ByO>&HFK8UM@&y0ldW zX)T+dn2&r}WtGHcVv7UKIhJ1cKkUg|MadIo2nB344D;-sy490}8mDQ=0>jcpT}X#f zT~}tIs~ETPn6RTHNd zp!=t`O`L3K6}hIVR^ls33v?ZCv^!LpEdZr5+nLg<^>pI1L|FBB&%_$dUDH)dY&9~m z6kQY7Wc6r=v5{;^WIr`|F=`XJZx&c5bh2DK7Iw^P-(*y39b7Li>uyqKYC|ZsT_!6t z<8Z_)$~F&DHD22uFAl!dL6mel$!I?Mz$O^0S8eyj_DHPbdSzE@Kku@Md~smJ722BX zI`h0f+Z<@WOuI9iO|5;3qA@Hr$Qw#4S*gO{*#Y>X_t-ED^KDo{nbW|Qx4ViKUD#%< zGDNT0g5J&by-uw9xhj1Eva*u)jjSG04_fDjYYF|Tqj=!@tQrb4<#%mr1-^xoC%+di zI{eO8wq1ptE4NhbXu0Cr zDssa^9qRMpeAa)IT4<=JY}#;QPdyDcN?lH(;|UT)bG<)Ll^({io$X0&4^rB6yNG(AM@ zTpl5Inj0!v?Fv*k>-g%tAgmo#FNQV52ijEdg?v@{Yp2L_<>V^aj;m|9pN#y#^(?HV zQlN+iI=HVzZS7WQm2Xv}$BPECy{#;4yQ9uHJ&QqAD>mSLiJ^?BP7-?PzLB<`N()tA zd)vN|ZzPU8%Vt)c&T3j~g2j{;Q?}V++nd&Z%5paT;z8TCFfA-?A3!azvQvou)dFcU zoB5i_XDc1muHR}rEppv&Xs)49s;;z3Th*q5MzZy|x45GUMmr6<8a31p=vB5YzrsM$ zH|_MHFaAB8CtKmyB#`djuN0sjMOEFufBjY4v?AJHcaKjIwim6W(T0XCT3g{nYKtx1 zt60|NpytLwsIzRswM9uX*bXVmm-z8^rj>v%eSAa7R-%R|=l*a$T1%qEQ_;Ox)sm%v zYVOXHyjiVA08J zQnujmO-36qRiiAlz1G)Iu5P{PE`v#gS2bn%~m)Ic<1nd;iAv5fsur+taUGr-s|5*{zXI zo+v?SM@~adQ?GTWz3exQRPMZ|omNf0^-TyJOS{9HwyX}R*G6eO&r%zZ);pH-ZTN&w z_~w>6QiHao9d&!J$HBySvskZ_q1z}4XzuVtYMZnNfHdD~ko4oWddTbBVpO&ZyAAdO zt&G}A7Vq|Yt>M}1-f*{dVR*l{6+g?fKY-M8zRsy<5+DAm9TkX4VS4+kWtnP7*c}Dm zl2sw3cnH0-Yel35Ye(CFmdY(v-q$;oUA3&Jmd_(ggSM2lq36TN6N63AHc$8~78ptv zxrdhJPOXZO(ID_6ujv z6x-^QkllT5(QM#RT<`rV7?gF}x=_y#%1Twv)My+kFL;G%Bh=P7TjOEH^a=Ht*`4p({5vHk%dY-OYG&cmCe6J7cTPcV}v0Z-W+|`Wplbo!PE`X1qVC zVW9PHFZoIzYHH(B^MvK-;g)VpJQrl%Zng7%7>E9*qPckX-1)`xXHWld{p88!nUjm> z7EdlNo;ux32Tgy6?PoR4uO=UyS#E4CY^C7<(;z89(}YkxYjsdX4h61 z8Xv4a{BhE_^2zB>b{iKKKl-SgnyEC`XuWa10pNe9uF}NRZUv6Aj$-6r@8t01k%5vOjmz~8Aw;EeN zNrn%1^`(7#A+evb&Sm>@|5De!beHegmuo*6H15Ukcb7Yj^Eb|)yR@hycR#tg-H10% zpa0Q&dQ1DG)Bettv!@%YH@ibM;iEfOuC(pT2k$LdOY+P28)rXwuyt-r2p4XYKhhgJ z*B%J+_Cl(bEZn~J-h;`(oD61`KDG%w?kj=ho4cOyY&6*_TYHEasEWqMfj`QET? zf7H{a^3iy1wDIySDCm{%%~j z15>{zO#HS`9v7GT!Q#=EgjGRbPa2`=HV5020Y0$3x~&^Ap2+GPss*FnUI+!J25?~x zKBroKQF7IqtGbb+bgW-$TGl$nC!_tnD4T4pxbnL=N(R1hTc0A-*V^TpAFum;X14Sf z?uu5M_0Q(+aXPU5y?M>(&EFek!yDZdyO%QAw|3Xo4`~~s%6au#F(hm&QB)dCtQ^(J zp0Mk(eD5>sG;6f4F|3d~f9mvjtrV8$I_`LxVEd61CH+UfA+)V|e|*nR^|n%HEpw1Zm}(Fuh#%`y}d24-K0-v=Hr=eJ8eE`JQHlm##{e6})Ozot!6@3_HoD zUro5x|vv5cz9|rQT6ypNy+ZZ&n^#ahHm>zt4;N6r-*LYue3(9PbUwwrC^h@ z*5Xh{g}?w|Fhb%b)d5~$sMj%Kys^NsIDOV1;Whl$@toII1}wiOjNwlNV(wXCa1 z(A_=L(P`bG|&YnWfy+vcGKTIR$ORov(R%i_E0R<~TJwa4AL{;F0%ZZX3 z<)*gU>Ylu0)mj){2f{~DR+0OSJHJh3dpcIc8juI|H~?lZYkY2br>`Z6huDE_fY282 zc-utihP#J$Jr*tMzcn>u`NmbRf;6yHmF(Z!uD4z_>XoFl0*EGhY21VmA6l7f8Pd{I zI#ng3&yega6Y;%V|#AO3wFC_)DoOmett6B zb4Ukv158tbk47K3I?#T;v9Y0{JhH8REo2TfLA$3)+jbNin9>gqISJqP`Uc^yS=h4o zN4LUKLYsc!ITU|6jXgqap z!q#6>4DBY4!`K4H_Y)M?2BnQ(t%y7lZPPbY6h0D)aX{VhK+s7RL$z-$(Tc|&fYF|T z-TU+Wp_i&X?y#d-t`&00g)I$McTBS}B#-cCoi?EIFLCV-ZWj%K)_ zQLpo@zw*T9DWx49%s1z}LwuL&1trk+DqO=Ebwpck*mD}{_;~M^ntQZK76xe9Te{dw ztEUarqMd3HY?D&h`%1Lv)M}_6dz-zzFRX8J8~=7|^ob7k&c&t;bc9c6RGFR11~38{JCvx0gH+&8^+Of_HaO-@dg#9*pzPEn##= zdcJP9%|OqVSF5&G^+>gp6IB(Ij<3H}}+7uBtFVzCfax|D7SEnJeg32#d)4}{5jPHO+BEDo zMkCzDXcW8lAjaf%+mb;8Mc~>pk1qS6tGdxUqiL}h9%@|^b>>B|E$vfX?;pP?qhHg# z;MB6ASNDF~+UwTpUZVAzA4E;kbgCcg%rh|)ujzq5`?dE*HHVFNFze~O-e(%u`=YJy z9r+A&;ISU>MGZ_n8RA=kDuDGst&-rl@T`m7zwCc}zDgyP&$h{- z?KTw~dNM%!pK3_7v!!XvKHiE4^U+mpS=w!rmbP^3&lg!V+KNZ@o1XvVmJX;5nTeId zhCX8HroIlXv=yHHEYg(hX;Ige4eW8E=e z*>E>cyIZ5^>61uL=$~xppHua1^ZiF}_Agg`-y3Cb+l@rU%ny565+2U+1itjbm;JIg zbPFibmEO1LupQm`=uYTAb&Wm8s3(do!>Dt$Ior%~t31=ruDwv|sn=ZH88*Vz2_668 zQWkw|UA&=RTrOMp{eU0aO>_06mJ+(`sJh^}=%Z@&qyk74nD6lwTUrim?&?v2e)N8( z$JpZBwkC8I9dPCPjXPJ@uh>KJR&ZK#d}XA^5_@%B)vSik(m#x*k4}Al=-oGt{NisN z`LfWr11XX%_EkzxKo{Ju^sW)fPSE-rKE0FO1rY>ImJHT6+2DebFT-pM;NDecns&Cy~~# z>au!QWbWzX`g-c_k7m^k8V42%?W}*odOe!B#b1qtrY>{o=+TSe>*PiM)fhh3J#qE3 zWvYq&3(F`wsw?+XQk_o5>8J+!^0c(0D4al1g0lRj9dboheMmc*n6-e>G^yWwon-Zw zU^)92M~BkR``M1?R}EC%V5t5Rnho84ysySvEA8RG?7mGDT0BJxXCqxk!(lhq@=lF^B5^QXR;37|yD zA=dv!JDM)yUB{Yy>)Ydr=s^9b^6}X!STEc!{eDr}epiRci?=ru%@}W2Tc0ya)i>%V z%dAfytBMNOrj?_OI1N1Yi(azX@#*7dPblSi)$Ch|PdRoMZ)VBMlb{?P1_?)2NP79B z+dR?ij{Ub+{v@D})pDr)mbP}3Y7NhlI%_?N9gNYV_TSWf_R9T-bzCq42q1s}0tg_0 z00IagfB*srAbKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R;Y93%qscx2BF9 zKR((@`pIV8?d~4`hFexecute("INSERT INTO config (name, value) VALUES ('foo', 'bar');"); - } - - /** - * Migrate Down. - */ - public function down() - { - $this->execute("DELETE FROM config WHERE name = 'foo' AND value = 'bar';"); - } -} \ No newline at end of file diff --git a/phinx.yml b/phinx.yml deleted file mode 100644 index 268694437..000000000 --- a/phinx.yml +++ /dev/null @@ -1,17 +0,0 @@ -paths: - migrations: %%PHINX_CONFIG_DIR%%/migrations - -environments: - default_migration_table: phinxlog - default_database: development - production: - adapter: sqlite - name: app/db/poche - - development: - adapter: sqlite - name: app/db/poche - - testing: - adapter: sqlite - name: app/db/poche From 75e9d1df03831a3dc1f92b0ef713c5e2f90fa543 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 2 Jun 2015 16:58:19 +0200 Subject: [PATCH 2/2] Update to Symfony 2.7 And fix some deps instead of using dev tags --- composer.json | 17 +- composer.lock | 156 ++++++------------ .../CoreBundle/Form/Type/ConfigType.php | 9 +- .../CoreBundle/Form/Type/EntryType.php | 4 +- .../CoreBundle/Form/Type/NewUserType.php | 4 +- src/Wallabag/CoreBundle/Form/Type/RssType.php | 4 +- .../Form/Type/UserInformationType.php | 4 +- .../WallabagUserPasswordValidator.php | 11 +- .../Tests/Controller/ConfigControllerTest.php | 6 +- 9 files changed, 80 insertions(+), 135 deletions(-) diff --git a/composer.json b/composer.json index 590e26293..5fe6eb022 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/symfony": "2.6.*", + "symfony/symfony": "~2.7.0", "doctrine/orm": "~2.2,>=2.2.3", "doctrine/doctrine-bundle": "~1.2", "twig/extensions": "~1.0", @@ -64,19 +64,18 @@ "sensio/distribution-bundle": "~3.0.12", "sensio/framework-extra-bundle": "~3.0", "incenteev/composer-parameter-handler": "~2.0", - "nelmio/cors-bundle": "1.3.*@dev", - "umpirsky/twig-gettext-extractor": "1.1.*", + "nelmio/cors-bundle": "~1.4.0", + "umpirsky/twig-gettext-extractor": "~1.1.5", "friendsofsymfony/rest-bundle": "~1.4", "jms/serializer-bundle": "~0.13", "nelmio/api-doc-bundle": "~2.7", "ezyang/htmlpurifier": "~4.6", "mgargano/simplehtmldom": "~1.5", - "robmorgan/phinx": "~0.4", "tecnick.com/tcpdf": "~6.2", "simplepie/simplepie": "~1.3.1", - "willdurand/hateoas-bundle": "1.0.*@dev", - "htmlawed/htmlawed": "dev-master", - "liip/theme-bundle": "1.1.3", + "willdurand/hateoas-bundle": "~0.5.0", + "htmlawed/htmlawed": "~1.1.19", + "liip/theme-bundle": "~1.1.3", "wallabag/PHP-Flash-Messages": "dev-master", "wallabag/kriss_php5": "dev-master", "wallabag/pagination": "dev-master", @@ -84,10 +83,10 @@ "wallabag/php-readability": "dev-master", "wallabag/phpMobi": "dev-master", "wallabag/Fivefilters_Libraries": "dev-master", - "pagerfanta/pagerfanta": "~1.0@dev" + "pagerfanta/pagerfanta": "~1.0.3" }, "require-dev": { - "doctrine/doctrine-fixtures-bundle": "dev-master", + "doctrine/doctrine-fixtures-bundle": "~2.2.0", "sensio/generator-bundle": "~2.5", "phpunit/phpunit": "~4.4" }, diff --git a/composer.lock b/composer.lock index d32f09802..a5620bb1e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "43d869c37ae73d7b74d3f77c4028bf9c", + "hash": "d7869b0dce6699d8f4916e675a4209a8", "packages": [ { "name": "doctrine/annotations", @@ -898,16 +898,16 @@ }, { "name": "htmlawed/htmlawed", - "version": "dev-master", + "version": "1.1.19", "source": { "type": "git", "url": "https://github.com/kesar/HTMLawed.git", - "reference": "f842e793614bdf3af70a62b1e70570e824dc9ab6" + "reference": "620c38edd57e680260ebd8dd0e98167d97e9a7bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kesar/HTMLawed/zipball/f842e793614bdf3af70a62b1e70570e824dc9ab6", - "reference": "f842e793614bdf3af70a62b1e70570e824dc9ab6", + "url": "https://api.github.com/repos/kesar/HTMLawed/zipball/620c38edd57e680260ebd8dd0e98167d97e9a7bf", + "reference": "620c38edd57e680260ebd8dd0e98167d97e9a7bf", "shasum": "" }, "require": { @@ -931,7 +931,7 @@ "role": "Developer" } ], - "description": "htmLawed - Process text with HTML markup to make it more compliant with HTML standards and administrative policies", + "description": "htmLawed - Process text with HTML markup to make it more compliant with HTML standards and administrative policies", "homepage": "http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/", "keywords": [ "HTMLtidy", @@ -940,7 +940,7 @@ "strip", "tags" ], - "time": "2015-04-12 19:37:20" + "time": "2015-04-05 17:23:05" }, { "name": "incenteev/composer-parameter-handler", @@ -1651,17 +1651,17 @@ }, { "name": "nelmio/cors-bundle", - "version": "1.3.3", + "version": "1.4.0", "target-dir": "Nelmio/CorsBundle", "source": { "type": "git", "url": "https://github.com/nelmio/NelmioCorsBundle.git", - "reference": "d482c01f6ca0840025b81b65534d0ffb7c18f425" + "reference": "553b4c5cdb3ff155f910e8f6e3e0806d42c763a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/d482c01f6ca0840025b81b65534d0ffb7c18f425", - "reference": "d482c01f6ca0840025b81b65534d0ffb7c18f425", + "url": "https://api.github.com/repos/nelmio/NelmioCorsBundle/zipball/553b4c5cdb3ff155f910e8f6e3e0806d42c763a6", + "reference": "553b4c5cdb3ff155f910e8f6e3e0806d42c763a6", "shasum": "" }, "require": { @@ -1702,7 +1702,7 @@ "cors", "crossdomain" ], - "time": "2014-12-10 17:26:49" + "time": "2015-01-13 17:53:27" }, { "name": "pagerfanta/pagerfanta", @@ -1908,68 +1908,6 @@ ], "time": "2012-12-21 11:40:51" }, - { - "name": "robmorgan/phinx", - "version": "v0.4.3", - "source": { - "type": "git", - "url": "https://github.com/robmorgan/phinx.git", - "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/robmorgan/phinx/zipball/0d1f9cb9939f65f506a8a3f5fee356764c310fd4", - "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/config": "~2.6.0", - "symfony/console": "~2.6.0", - "symfony/yaml": "~2.6.0" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*", - "squizlabs/php_codesniffer": "dev-phpcs-fixer" - }, - "bin": [ - "bin/phinx" - ], - "type": "library", - "autoload": { - "psr-4": { - "Phinx\\": "src/Phinx" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rob Morgan", - "email": "robbym@gmail.com", - "homepage": "http://robmorgan.id.au", - "role": "Lead Developer" - }, - { - "name": "Woody Gilk", - "email": "woody.gilk@gmail.com", - "homepage": "http://shadowhand.me", - "role": "Developer" - } - ], - "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", - "homepage": "https://phinx.org", - "keywords": [ - "database", - "database migrations", - "db", - "migrations", - "phinx" - ], - "time": "2015-02-23 16:38:12" - }, { "name": "sensio/distribution-bundle", "version": "v3.0.28", @@ -2419,25 +2357,26 @@ }, { "name": "symfony/symfony", - "version": "v2.6.9", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "b06539573ccf64dd3a62852685f052553d02c5ba" + "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/b06539573ccf64dd3a62852685f052553d02c5ba", - "reference": "b06539573ccf64dd3a62852685f052553d02c5ba", + "url": "https://api.github.com/repos/symfony/symfony/zipball/9975b1eca3de4db792a2c3e4e16f676a4aadcd46", + "reference": "9975b1eca3de4db792a2c3e4e16f676a4aadcd46", "shasum": "" }, "require": { "doctrine/common": "~2.3", - "php": ">=5.3.3", + "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.12,>=1.12.3" + "twig/twig": "~1.18" }, "replace": { + "symfony/asset": "self.version", "symfony/browser-kit": "self.version", "symfony/class-loader": "self.version", "symfony/config": "self.version", @@ -2461,7 +2400,6 @@ "symfony/monolog-bridge": "self.version", "symfony/options-resolver": "self.version", "symfony/process": "self.version", - "symfony/propel1-bridge": "self.version", "symfony/property-access": "self.version", "symfony/proxy-manager-bridge": "self.version", "symfony/routing": "self.version", @@ -2492,18 +2430,23 @@ "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", - "propel/propel1": "~1.6", - "symfony/phpunit-bridge": "~2.7" + "symfony/phpunit-bridge": "self.version" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { - "Symfony\\": "src/" + "psr-4": { + "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", + "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", + "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", + "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", + "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", + "Symfony\\Bundle\\": "src/Symfony/Bundle/", + "Symfony\\Component\\": "src/Symfony/Component/" }, "classmap": [ "src/Symfony/Component/HttpFoundation/Resources/stubs", @@ -2532,7 +2475,7 @@ "keywords": [ "framework" ], - "time": "2015-05-29 22:55:07" + "time": "2015-05-30 16:52:28" }, { "name": "tecnick.com/tcpdf", @@ -3108,17 +3051,17 @@ }, { "name": "willdurand/hateoas-bundle", - "version": "dev-master", + "version": "0.5.0", "target-dir": "Bazinga/Bundle/HateoasBundle", "source": { "type": "git", "url": "https://github.com/willdurand/BazingaHateoasBundle.git", - "reference": "a99f48ea5004a89ecf0927229d9c912fed9fa4ab" + "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/a99f48ea5004a89ecf0927229d9c912fed9fa4ab", - "reference": "a99f48ea5004a89ecf0927229d9c912fed9fa4ab", + "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/3c86e8080e8a229365a0ce91818da6fe6562376b", + "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b", "shasum": "" }, "require": { @@ -3156,7 +3099,7 @@ "HATEOAS", "rest" ], - "time": "2015-03-12 15:49:24" + "time": "2015-02-19 16:27:51" }, { "name": "willdurand/jsonp-callback-validator", @@ -3308,17 +3251,17 @@ }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "dev-master", + "version": "v2.2.0", "target-dir": "Doctrine/Bundle/FixturesBundle", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "c5ff0542772102ddd4e2fbe173e9ad40ad67c22f" + "reference": "c811f96f0cf83b997e3a3ed037cac729bbe3e803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c5ff0542772102ddd4e2fbe173e9ad40ad67c22f", - "reference": "c5ff0542772102ddd4e2fbe173e9ad40ad67c22f", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c811f96f0cf83b997e3a3ed037cac729bbe3e803", + "reference": "c811f96f0cf83b997e3a3ed037cac729bbe3e803", "shasum": "" }, "require": { @@ -3330,7 +3273,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -3343,6 +3286,12 @@ "MIT" ], "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" @@ -3350,10 +3299,6 @@ { "name": "Doctrine Project", "homepage": "http://www.doctrine-project.org" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" } ], "description": "Symfony DoctrineFixturesBundle", @@ -3362,7 +3307,7 @@ "Fixture", "persistence" ], - "time": "2015-01-19 02:21:37" + "time": "2013-09-05 11:23:37" }, { "name": "phpdocumentor/reflection-docblock", @@ -4269,18 +4214,13 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "nelmio/cors-bundle": 20, - "willdurand/hateoas-bundle": 20, - "htmlawed/htmlawed": 20, "wallabag/php-flash-messages": 20, "wallabag/kriss_php5": 20, "wallabag/pagination": 20, "wallabag/phpepub": 20, "wallabag/php-readability": 20, "wallabag/phpmobi": 20, - "wallabag/fivefilters_libraries": 20, - "pagerfanta/pagerfanta": 20, - "doctrine/doctrine-fixtures-bundle": 20 + "wallabag/fivefilters_libraries": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index d5890971a..49b05b807 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; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class ConfigType extends AbstractType { @@ -24,14 +24,17 @@ class ConfigType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('theme', 'choice', array('choices' => $this->themes)) + ->add('theme', 'choice', array( + 'choices' => array_flip($this->themes), + 'choices_as_values' => true, + )) ->add('items_per_page') ->add('language') ->add('save', 'submit') ; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( 'data_class' => 'Wallabag\CoreBundle\Entity\Config', diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryType.php b/src/Wallabag/CoreBundle/Form/Type/EntryType.php index 0532bf104..4abdc10b3 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryType.php @@ -4,7 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class EntryType extends AbstractType { @@ -16,7 +16,7 @@ class EntryType extends AbstractType ; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( '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 a12fff2b9..985cb55b2 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; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Validator\Constraints; class NewUserType extends AbstractType @@ -27,7 +27,7 @@ class NewUserType extends AbstractType ; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( '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 e14e84e10..1f7f4c682 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; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class RssType extends AbstractType { @@ -16,7 +16,7 @@ class RssType extends AbstractType ; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( '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 f0367d14f..1b6280511 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; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class UserInformationType extends AbstractType { @@ -17,7 +17,7 @@ class UserInformationType extends AbstractType ; } - public function setDefaultOptions(OptionsResolverInterface $resolver) + public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults(array( '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 5586f9762..520627737 100644 --- a/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php +++ b/src/Wallabag/CoreBundle/Security/Validator/WallabagUserPasswordValidator.php @@ -3,7 +3,7 @@ namespace Wallabag\CoreBundle\Security\Validator; use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Security\Core\SecurityContextInterface; +use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; @@ -11,14 +11,17 @@ use Symfony\Component\Validator\Exception\ConstraintDefinitionException; use Symfony\Component\Validator\Exception\UnexpectedTypeException; use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; +/** + * @see Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator + */ class WallabagUserPasswordValidator extends ConstraintValidator { private $securityContext; private $encoderFactory; - public function __construct(SecurityContextInterface $securityContext, EncoderFactoryInterface $encoderFactory) + public function __construct(TokenStorageInterface $tokenStorage, EncoderFactoryInterface $encoderFactory) { - $this->securityContext = $securityContext; + $this->tokenStorage = $tokenStorage; $this->encoderFactory = $encoderFactory; } @@ -31,7 +34,7 @@ class WallabagUserPasswordValidator extends ConstraintValidator throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\UserPassword'); } - $user = $this->securityContext->getToken()->getUser(); + $user = $this->tokenStorage->getToken()->getUser(); if (!$user instanceof UserInterface) { 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 a01457808..f72cba659 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 $form = $crawler->filter('button[id=config_save]')->form(); $data = array( - 'config[theme]' => 'baggy', + 'config[theme]' => 0, 'config[items_per_page]' => '30', 'config[language]' => 'fr_FR', ); @@ -63,12 +63,12 @@ class ConfigControllerTest extends WallabagCoreTestCase { return array( array(array( - 'config[theme]' => 'baggy', + 'config[theme]' => 0, 'config[items_per_page]' => '', 'config[language]' => 'fr_FR', )), array(array( - 'config[theme]' => 'baggy', + 'config[theme]' => 0, 'config[items_per_page]' => '12', 'config[language]' => '', )),