Download as
Browse Code »

Commit 49d7c6e73c14ef5bb1545151ebf859cdf92f9874

Authored by Eduardo Santos
1 parent 38a08295
Exists in master and in 1 other branch 3.1

Adição de versão anterior do knp-menu-bundle

Showing 2 changed files with 75 additions and 68 deletions   Show diff stats
composer.json
  Diff comments   View file @49d7c6e
... ... @@ -48,8 +48,8 @@
48 48 "ijanki/ftp-bundle": "*",
49 49 "jms/translation-bundle": "1.1.*@dev",
50 50 "helios-ag/fm-elfinder-bundle": "1.x",
51   - "knplabs/knp-menu": "2.0.*@alpha",
52   - "knplabs/knp-menu-bundle": "2.0.*@alpha",
  51 + "knplabs/knp-menu": "2.0.0-alpha1",
  52 + "knplabs/knp-menu-bundle": "2.0.0-alpha1",
53 53 "jpgraph/jpgraph": "dev-master",
54 54 "symfony/class-loader": "2.2.*",
55 55 "friendsofsymfony/rest-bundle": "dev-master",
... ...
composer.lock
  Diff comments   View file @49d7c6e
... ... @@ -3,7 +3,7 @@
3 3 "This file locks the dependencies of your project to a known state",
4 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
5 5 ],
6   - "hash": "2fe980152192889d593d2faedb57d239",
  6 + "hash": "57c6d0e2db50a03a5f8810325020941d",
7 7 "packages": [
8 8 {
9 9 "name": "braincrafted/bootstrap-bundle",
... ... @@ -68,20 +68,21 @@
68 68 },
69 69 {
70 70 "name": "ddeboer/data-import",
71   - "version": "0.12.2",
  71 + "version": "0.13.0",
72 72 "source": {
73 73 "type": "git",
74 74 "url": "https://github.com/ddeboer/data-import.git",
75   - "reference": "6a7d4e6d80e7011b63c6d747952bae072d8009df"
  75 + "reference": "ad21938f74177a0258c64a535ccf3c453569ee23"
76 76 },
77 77 "dist": {
78 78 "type": "zip",
79   - "url": "https://api.github.com/repos/ddeboer/data-import/zipball/6a7d4e6d80e7011b63c6d747952bae072d8009df",
80   - "reference": "6a7d4e6d80e7011b63c6d747952bae072d8009df",
  79 + "url": "https://api.github.com/repos/ddeboer/data-import/zipball/ad21938f74177a0258c64a535ccf3c453569ee23",
  80 + "reference": "ad21938f74177a0258c64a535ccf3c453569ee23",
81 81 "shasum": ""
82 82 },
83 83 "require": {
84   - "php": ">=5.3.0"
  84 + "php": ">=5.3.0",
  85 + "psr/log": "1.0.0"
85 86 },
86 87 "require-dev": {
87 88 "doctrine/dbal": "*",
... ... @@ -133,7 +134,7 @@
133 134 "export",
134 135 "import"
135 136 ],
136   - "time": "2014-03-28 08:49:45"
  137 + "time": "2014-05-14 20:39:26"
137 138 },
138 139 {
139 140 "name": "ddeboer/data-import-bundle",
... ... @@ -168,7 +169,7 @@
168 169 {
169 170 "name": "David de Boer",
170 171 "email": "david@ddeboer.nl",
171   - "homepage": "https://github.com/ddeboer"
  172 + "homepage": "http://ddeboer.nl"
172 173 }
173 174 ],
174 175 "description": "A Symfony2 bundle for the ddeboer/data-import library",
... ... @@ -217,7 +218,7 @@
217 218 ],
218 219 "authors": [
219 220 {
220   - "name": "Jonathan H. Wage",
  221 + "name": "Jonathan Wage",
221 222 "email": "jonwage@gmail.com",
222 223 "homepage": "http://www.jwage.com/",
223 224 "role": "Creator"
... ... @@ -236,9 +237,9 @@
236 237 "email": "kontakt@beberlei.de"
237 238 },
238 239 {
239   - "name": "Johannes Schmitt",
  240 + "name": "Johannes M. Schmitt",
240 241 "email": "schmittjoh@gmail.com",
241   - "homepage": "http://jmsyst.com",
  242 + "homepage": "https://github.com/schmittjoh",
242 243 "role": "Developer of wrapped JMSSerializerBundle"
243 244 }
244 245 ],
... ... @@ -292,7 +293,7 @@
292 293 ],
293 294 "authors": [
294 295 {
295   - "name": "Jonathan H. Wage",
  296 + "name": "Jonathan Wage",
296 297 "email": "jonwage@gmail.com",
297 298 "homepage": "http://www.jwage.com/",
298 299 "role": "Creator"
... ... @@ -311,9 +312,9 @@
311 312 "email": "kontakt@beberlei.de"
312 313 },
313 314 {
314   - "name": "Johannes Schmitt",
  315 + "name": "Johannes M. Schmitt",
315 316 "email": "schmittjoh@gmail.com",
316   - "homepage": "http://jmsyst.com",
  317 + "homepage": "https://github.com/schmittjoh",
317 318 "role": "Developer of wrapped JMSSerializerBundle"
318 319 }
319 320 ],
... ... @@ -378,9 +379,9 @@
378 379 "email": "kontakt@beberlei.de"
379 380 },
380 381 {
381   - "name": "Johannes Schmitt",
  382 + "name": "Johannes M. Schmitt",
382 383 "email": "schmittjoh@gmail.com",
383   - "homepage": "http://jmsyst.com",
  384 + "homepage": "https://github.com/schmittjoh",
384 385 "role": "Developer of wrapped JMSSerializerBundle"
385 386 }
386 387 ],
... ... @@ -395,16 +396,16 @@
395 396 },
396 397 {
397 398 "name": "doctrine/common",
398   - "version": "v2.4.1",
  399 + "version": "v2.4.2",
399 400 "source": {
400 401 "type": "git",
401 402 "url": "https://github.com/doctrine/common.git",
402   - "reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7"
  403 + "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b"
403 404 },
404 405 "dist": {
405 406 "type": "zip",
406   - "url": "https://api.github.com/repos/doctrine/common/zipball/ceb18cf9b0230f3ea208b6238130fd415abda0a7",
407   - "reference": "ceb18cf9b0230f3ea208b6238130fd415abda0a7",
  407 + "url": "https://api.github.com/repos/doctrine/common/zipball/5db6ab40e4c531f14dad4ca96a394dfce5d4255b",
  408 + "reference": "5db6ab40e4c531f14dad4ca96a394dfce5d4255b",
408 409 "shasum": ""
409 410 },
410 411 "require": {
... ... @@ -415,6 +416,9 @@
415 416 "doctrine/lexer": "1.*",
416 417 "php": ">=5.3.2"
417 418 },
  419 + "require-dev": {
  420 + "phpunit/phpunit": "~3.7"
  421 + },
418 422 "type": "library",
419 423 "extra": {
420 424 "branch-alias": {
... ... @@ -466,7 +470,7 @@
466 470 "persistence",
467 471 "spl"
468 472 ],
469   - "time": "2013-09-07 10:20:34"
  473 + "time": "2014-05-21 19:28:51"
470 474 },
471 475 {
472 476 "name": "doctrine/data-fixtures",
... ... @@ -829,9 +833,9 @@
829 833 "email": "kontakt@beberlei.de"
830 834 },
831 835 {
832   - "name": "Johannes Schmitt",
  836 + "name": "Johannes M. Schmitt",
833 837 "email": "schmittjoh@gmail.com",
834   - "homepage": "http://jmsyst.com",
  838 + "homepage": "https://github.com/schmittjoh",
835 839 "role": "Developer of wrapped JMSSerializerBundle"
836 840 }
837 841 ],
... ... @@ -883,9 +887,9 @@
883 887 "email": "roman@code-factory.org"
884 888 },
885 889 {
886   - "name": "Johannes Schmitt",
  890 + "name": "Johannes M. Schmitt",
887 891 "email": "schmittjoh@gmail.com",
888   - "homepage": "http://jmsyst.com",
  892 + "homepage": "https://github.com/schmittjoh",
889 893 "role": "Developer of wrapped JMSSerializerBundle"
890 894 }
891 895 ],
... ... @@ -1035,12 +1039,12 @@
1035 1039 "source": {
1036 1040 "type": "git",
1037 1041 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
1038   - "reference": "6e5017a66437fdf54c88db75edeec25e4354b4f6"
  1042 + "reference": "6b384c108fa89a5ace02124d200bd916ab5ac380"
1039 1043 },
1040 1044 "dist": {
1041 1045 "type": "zip",
1042   - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/6e5017a66437fdf54c88db75edeec25e4354b4f6",
1043   - "reference": "6e5017a66437fdf54c88db75edeec25e4354b4f6",
  1046 + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/6b384c108fa89a5ace02124d200bd916ab5ac380",
  1047 + "reference": "6b384c108fa89a5ace02124d200bd916ab5ac380",
1044 1048 "shasum": ""
1045 1049 },
1046 1050 "require": {
... ... @@ -1105,7 +1109,7 @@
1105 1109 "keywords": [
1106 1110 "rest"
1107 1111 ],
1108   - "time": "2014-04-21 08:26:51"
  1112 + "time": "2014-05-27 08:47:40"
1109 1113 },
1110 1114 {
1111 1115 "name": "helios-ag/fm-elfinder-bundle",
... ... @@ -1145,7 +1149,7 @@
1145 1149 ],
1146 1150 "authors": [
1147 1151 {
1148   - "name": "Al Ganiev",
  1152 + "name": "Albert Ganiev",
1149 1153 "email": "helios.ag@gmail.com"
1150 1154 },
1151 1155 {
... ... @@ -1190,7 +1194,7 @@
1190 1194 ],
1191 1195 "authors": [
1192 1196 {
1193   - "name": "Al Ganiev",
  1197 + "name": "Albert Ganiev",
1194 1198 "email": "helios.ag@gmail.com"
1195 1199 },
1196 1200 {
... ... @@ -1393,7 +1397,7 @@
1393 1397 {
1394 1398 "name": "Johannes M. Schmitt",
1395 1399 "email": "schmittjoh@gmail.com",
1396   - "homepage": "http://jmsyst.com",
  1400 + "homepage": "https://github.com/schmittjoh",
1397 1401 "role": "Developer of wrapped JMSSerializerBundle"
1398 1402 }
1399 1403 ],
... ... @@ -1435,7 +1439,7 @@
1435 1439 {
1436 1440 "name": "Johannes M. Schmitt",
1437 1441 "email": "schmittjoh@gmail.com",
1438   - "homepage": "http://jmsyst.com",
  1442 + "homepage": "https://github.com/schmittjoh",
1439 1443 "role": "Developer of wrapped JMSSerializerBundle"
1440 1444 }
1441 1445 ],
... ... @@ -1500,7 +1504,7 @@
1500 1504 {
1501 1505 "name": "Johannes M. Schmitt",
1502 1506 "email": "schmittjoh@gmail.com",
1503   - "homepage": "http://jmsyst.com",
  1507 + "homepage": "https://github.com/schmittjoh",
1504 1508 "role": "Developer of wrapped JMSSerializerBundle"
1505 1509 }
1506 1510 ],
... ... @@ -1551,7 +1555,7 @@
1551 1555 {
1552 1556 "name": "Johannes M. Schmitt",
1553 1557 "email": "schmittjoh@gmail.com",
1554   - "homepage": "http://jmsyst.com",
  1558 + "homepage": "https://github.com/schmittjoh",
1555 1559 "role": "Developer of wrapped JMSSerializerBundle"
1556 1560 }
1557 1561 ],
... ... @@ -1655,7 +1659,7 @@
1655 1659 {
1656 1660 "name": "Johannes M. Schmitt",
1657 1661 "email": "schmittjoh@gmail.com",
1658   - "homepage": "http://jmsyst.com",
  1662 + "homepage": "https://github.com/schmittjoh",
1659 1663 "role": "Developer of wrapped JMSSerializerBundle"
1660 1664 }
1661 1665 ],
... ... @@ -1725,7 +1729,7 @@
1725 1729 {
1726 1730 "name": "Johannes M. Schmitt",
1727 1731 "email": "schmittjoh@gmail.com",
1728   - "homepage": "http://jmsyst.com",
  1732 + "homepage": "https://github.com/schmittjoh",
1729 1733 "role": "Developer of wrapped JMSSerializerBundle"
1730 1734 }
1731 1735 ],
... ... @@ -1795,7 +1799,7 @@
1795 1799 {
1796 1800 "name": "Johannes M. Schmitt",
1797 1801 "email": "schmittjoh@gmail.com",
1798   - "homepage": "http://jmsyst.com",
  1802 + "homepage": "https://github.com/schmittjoh",
1799 1803 "role": "Developer of wrapped JMSSerializerBundle"
1800 1804 }
1801 1805 ],
... ... @@ -2100,7 +2104,7 @@
2100 2104 "email": "stof@notk.org"
2101 2105 },
2102 2106 {
2103   - "name": "Knplabs",
  2107 + "name": "KnpLabs",
2104 2108 "homepage": "http://knplabs.com"
2105 2109 },
2106 2110 {
... ... @@ -2121,12 +2125,12 @@
2121 2125 "source": {
2122 2126 "type": "git",
2123 2127 "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git",
2124   - "reference": "7ea961c9ef60343a359f513c9fec7fd3bb65ddcb"
  2128 + "reference": "8067a1b46260c619ae8f3ffa3c32a612ff04924c"
2125 2129 },
2126 2130 "dist": {
2127 2131 "type": "zip",
2128   - "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/7ea961c9ef60343a359f513c9fec7fd3bb65ddcb",
2129   - "reference": "7ea961c9ef60343a359f513c9fec7fd3bb65ddcb",
  2132 + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/8067a1b46260c619ae8f3ffa3c32a612ff04924c",
  2133 + "reference": "8067a1b46260c619ae8f3ffa3c32a612ff04924c",
2130 2134 "shasum": ""
2131 2135 },
2132 2136 "require": {
... ... @@ -2171,7 +2175,7 @@
2171 2175 "pagination",
2172 2176 "paginator"
2173 2177 ],
2174   - "time": "2014-03-04 08:53:05"
  2178 + "time": "2014-05-13 07:26:35"
2175 2179 },
2176 2180 {
2177 2181 "name": "kriswallsmith/assetic",
... ... @@ -2292,12 +2296,12 @@
2292 2296 "source": {
2293 2297 "type": "git",
2294 2298 "url": "https://github.com/lightbase/cocar.git",
2295   - "reference": "2fc869b73608ed4d7821e7a2752cd555fc912dfd"
  2299 + "reference": "dc673a78aa4d15ec040647e6438cdc89bed7a8f5"
2296 2300 },
2297 2301 "dist": {
2298 2302 "type": "zip",
2299   - "url": "https://api.github.com/repos/lightbase/cocar/zipball/2fc869b73608ed4d7821e7a2752cd555fc912dfd",
2300   - "reference": "2fc869b73608ed4d7821e7a2752cd555fc912dfd",
  2303 + "url": "https://api.github.com/repos/lightbase/cocar/zipball/dc673a78aa4d15ec040647e6438cdc89bed7a8f5",
  2304 + "reference": "dc673a78aa4d15ec040647e6438cdc89bed7a8f5",
2301 2305 "shasum": ""
2302 2306 },
2303 2307 "require": {
... ... @@ -2328,20 +2332,20 @@
2328 2332 "support": {
2329 2333 "source": "https://github.com/lightbase/cocar/tree/master"
2330 2334 },
2331   - "time": "2014-04-09 13:43:42"
  2335 + "time": "2014-05-27 13:07:44"
2332 2336 },
2333 2337 {
2334 2338 "name": "monolog/monolog",
2335   - "version": "1.9.0",
  2339 + "version": "1.9.1",
2336 2340 "source": {
2337 2341 "type": "git",
2338 2342 "url": "https://github.com/Seldaek/monolog.git",
2339   - "reference": "1afc39690e7414412face1f8cbf67b73db34485c"
  2343 + "reference": "65026b610f8c19e61d7242f600530677b0466aac"
2340 2344 },
2341 2345 "dist": {
2342 2346 "type": "zip",
2343   - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1afc39690e7414412face1f8cbf67b73db34485c",
2344   - "reference": "1afc39690e7414412face1f8cbf67b73db34485c",
  2347 + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/65026b610f8c19e61d7242f600530677b0466aac",
  2348 + "reference": "65026b610f8c19e61d7242f600530677b0466aac",
2345 2349 "shasum": ""
2346 2350 },
2347 2351 "require": {
... ... @@ -2396,7 +2400,7 @@
2396 2400 "logging",
2397 2401 "psr-3"
2398 2402 ],
2399   - "time": "2014-04-20 16:41:26"
  2403 + "time": "2014-04-24 13:29:03"
2400 2404 },
2401 2405 {
2402 2406 "name": "nikic/php-parser",
... ... @@ -2478,7 +2482,7 @@
2478 2482 {
2479 2483 "name": "Johannes M. Schmitt",
2480 2484 "email": "schmittjoh@gmail.com",
2481   - "homepage": "http://jmsyst.com",
  2485 + "homepage": "https://github.com/schmittjoh",
2482 2486 "role": "Developer of wrapped JMSSerializerBundle"
2483 2487 }
2484 2488 ],
... ... @@ -2528,7 +2532,7 @@
2528 2532 {
2529 2533 "name": "Johannes M. Schmitt",
2530 2534 "email": "schmittjoh@gmail.com",
2531   - "homepage": "http://jmsyst.com",
  2535 + "homepage": "https://github.com/schmittjoh",
2532 2536 "role": "Developer of wrapped JMSSerializerBundle"
2533 2537 }
2534 2538 ],
... ... @@ -2728,25 +2732,28 @@
2728 2732 },
2729 2733 {
2730 2734 "name": "swiftmailer/swiftmailer",
2731   - "version": "v5.1.0",
  2735 + "version": "v5.2.0",
2732 2736 "source": {
2733 2737 "type": "git",
2734 2738 "url": "https://github.com/swiftmailer/swiftmailer.git",
2735   - "reference": "748c01c1144713ac0118396935d10b6ceec91b68"
  2739 + "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48"
2736 2740 },
2737 2741 "dist": {
2738 2742 "type": "zip",
2739   - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/748c01c1144713ac0118396935d10b6ceec91b68",
2740   - "reference": "748c01c1144713ac0118396935d10b6ceec91b68",
  2743 + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/043e336b871f17a117f76ef8e190eddfc04c8d48",
  2744 + "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48",
2741 2745 "shasum": ""
2742 2746 },
2743 2747 "require": {
2744 2748 "php": ">=5.2.4"
2745 2749 },
  2750 + "require-dev": {
  2751 + "mockery/mockery": "~0.9.1"
  2752 + },
2746 2753 "type": "library",
2747 2754 "extra": {
2748 2755 "branch-alias": {
2749   - "dev-master": "5.1-dev"
  2756 + "dev-master": "5.2-dev"
2750 2757 }
2751 2758 },
2752 2759 "autoload": {
... ... @@ -2775,7 +2782,7 @@
2775 2782 "mail",
2776 2783 "mailer"
2777 2784 ],
2778   - "time": "2014-03-18 09:03:27"
  2785 + "time": "2014-05-08 08:11:19"
2779 2786 },
2780 2787 {
2781 2788 "name": "symfony/assetic-bundle",
... ... @@ -3347,7 +3354,7 @@
3347 3354 ],
3348 3355 "authors": [
3349 3356 {
3350   - "name": "William DURAND",
  3357 + "name": "William Durand",
3351 3358 "email": "william.durand1@gmail.com",
3352 3359 "homepage": "http://www.willdurand.fr"
3353 3360 }
... ... @@ -3357,16 +3364,16 @@
3357 3364 },
3358 3365 {
3359 3366 "name": "willdurand/negotiation",
3360   - "version": "1.3.2",
  3367 + "version": "1.3.3",
3361 3368 "source": {
3362 3369 "type": "git",
3363 3370 "url": "https://github.com/willdurand/Negotiation.git",
3364   - "reference": "cda64e26a980f433ce98200ba1b2301850489aab"
  3371 + "reference": "a98fb6b9808610c1aa326c736893d3d77d9383b6"
3365 3372 },
3366 3373 "dist": {
3367 3374 "type": "zip",
3368   - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/cda64e26a980f433ce98200ba1b2301850489aab",
3369   - "reference": "cda64e26a980f433ce98200ba1b2301850489aab",
  3375 + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/a98fb6b9808610c1aa326c736893d3d77d9383b6",
  3376 + "reference": "a98fb6b9808610c1aa326c736893d3d77d9383b6",
3370 3377 "shasum": ""
3371 3378 },
3372 3379 "require": {
... ... @@ -3403,7 +3410,7 @@
3403 3410 "header",
3404 3411 "negotiation"
3405 3412 ],
3406   - "time": "2014-02-26 13:56:25"
  3413 + "time": "2014-05-16 12:34:51"
3407 3414 }
3408 3415 ],
3409 3416 "packages-dev": [
... ...