Download as
Browse Code »

Commit d413a141e9d1825bec39dfd0633f8e2ec2017b2a

Authored by gabrielamayoli
2 parents 39556e9a 71d02332
Exists in master and in 1 other branch 3.1

Merge branch 'master' into 3.1

Showing 4 changed files with 192 additions and 103 deletions   Show diff stats
composer.json
  Diff comments   View file @d413a14
... ... @@ -56,6 +56,7 @@
56 56 "jms/serializer": "0.14.*@dev",
57 57 "jms/serializer-bundle": "0.13.*@dev",
58 58 "lightbase/cocar": "dev-master",
  59 + "ddeboer/data-import": "0.15.*@dev",
59 60 "ddeboer/data-import-bundle": "dev-master",
60 61 "twbs/bootstrap": "3.0.*",
61 62 "doctrine/migrations": "dev-master",
... ...
composer.lock
  Diff comments   View file @d413a14
1 1 {
2 2 "_readme": [
3 3 "This file locks the dependencies of your project to a known state",
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 6 ],
6   - "hash": "57c6d0e2db50a03a5f8810325020941d",
  7 + "hash": "4ce2775488ee172a7deb32d74d4dbf59",
7 8 "packages": [
8 9 {
9 10 "name": "braincrafted/bootstrap-bundle",
... ... @@ -68,16 +69,16 @@
68 69 },
69 70 {
70 71 "name": "ddeboer/data-import",
71   - "version": "0.13.0",
  72 + "version": "0.15.1",
72 73 "source": {
73 74 "type": "git",
74 75 "url": "https://github.com/ddeboer/data-import.git",
75   - "reference": "ad21938f74177a0258c64a535ccf3c453569ee23"
  76 + "reference": "1f5860972fdce2d1185499af3405d4633b658522"
76 77 },
77 78 "dist": {
78 79 "type": "zip",
79   - "url": "https://api.github.com/repos/ddeboer/data-import/zipball/ad21938f74177a0258c64a535ccf3c453569ee23",
80   - "reference": "ad21938f74177a0258c64a535ccf3c453569ee23",
  80 + "url": "https://api.github.com/repos/ddeboer/data-import/zipball/1f5860972fdce2d1185499af3405d4633b658522",
  81 + "reference": "1f5860972fdce2d1185499af3405d4633b658522",
81 82 "shasum": ""
82 83 },
83 84 "require": {
... ... @@ -91,7 +92,7 @@
91 92 "ext-mbstring": "*",
92 93 "ext-sqlite3": "*",
93 94 "phpoffice/phpexcel": "*",
94   - "symfony/console": ">=2.2",
  95 + "symfony/console": "~2.5.0",
95 96 "symfony/property-access": "*",
96 97 "symfony/validator": "~2.3.0"
97 98 },
... ... @@ -134,7 +135,7 @@
134 135 "export",
135 136 "import"
136 137 ],
137   - "time": "2014-05-14 20:39:26"
  138 + "time": "2014-06-18 11:39:08"
138 139 },
139 140 {
140 141 "name": "ddeboer/data-import-bundle",
... ... @@ -182,16 +183,16 @@
182 183 },
183 184 {
184 185 "name": "doctrine/annotations",
185   - "version": "v1.1.2",
  186 + "version": "v1.2.0",
186 187 "source": {
187 188 "type": "git",
188 189 "url": "https://github.com/doctrine/annotations.git",
189   - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670"
  190 + "reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd"
190 191 },
191 192 "dist": {
192 193 "type": "zip",
193   - "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670",
194   - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670",
  194 + "url": "https://api.github.com/repos/doctrine/annotations/zipball/d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd",
  195 + "reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd",
195 196 "shasum": ""
196 197 },
197 198 "require": {
... ... @@ -199,12 +200,13 @@
199 200 "php": ">=5.3.2"
200 201 },
201 202 "require-dev": {
202   - "doctrine/cache": "1.*"
  203 + "doctrine/cache": "1.*",
  204 + "phpunit/phpunit": "4.*"
203 205 },
204 206 "type": "library",
205 207 "extra": {
206 208 "branch-alias": {
207   - "dev-master": "1.0.x-dev"
  209 + "dev-master": "1.3.x-dev"
208 210 }
209 211 },
210 212 "autoload": {
... ... @@ -237,9 +239,9 @@
237 239 "email": "kontakt@beberlei.de"
238 240 },
239 241 {
240   - "name": "Johannes M. Schmitt",
  242 + "name": "Johannes Schmitt",
241 243 "email": "schmittjoh@gmail.com",
242   - "homepage": "https://github.com/schmittjoh",
  244 + "homepage": "http://jmsyst.com",
243 245 "role": "Developer of wrapped JMSSerializerBundle"
244 246 }
245 247 ],
... ... @@ -250,7 +252,7 @@
250 252 "docblock",
251 253 "parser"
252 254 ],
253   - "time": "2013-06-16 21:33:03"
  255 + "time": "2014-07-06 15:52:21"
254 256 },
255 257 {
256 258 "name": "doctrine/cache",
... ... @@ -312,9 +314,9 @@
312 314 "email": "kontakt@beberlei.de"
313 315 },
314 316 {
315   - "name": "Johannes M. Schmitt",
  317 + "name": "Johannes Schmitt",
316 318 "email": "schmittjoh@gmail.com",
317   - "homepage": "https://github.com/schmittjoh",
  319 + "homepage": "http://jmsyst.com",
318 320 "role": "Developer of wrapped JMSSerializerBundle"
319 321 }
320 322 ],
... ... @@ -360,7 +362,7 @@
360 362 ],
361 363 "authors": [
362 364 {
363   - "name": "Jonathan Wage",
  365 + "name": "Jonathan H. Wage",
364 366 "email": "jonwage@gmail.com",
365 367 "homepage": "http://www.jwage.com/",
366 368 "role": "Creator"
... ... @@ -379,7 +381,7 @@
379 381 "email": "kontakt@beberlei.de"
380 382 },
381 383 {
382   - "name": "Johannes M. Schmitt",
  384 + "name": "Johannes Schmitt",
383 385 "email": "schmittjoh@gmail.com",
384 386 "homepage": "https://github.com/schmittjoh",
385 387 "role": "Developer of wrapped JMSSerializerBundle"
... ... @@ -835,7 +837,7 @@
835 837 {
836 838 "name": "Johannes M. Schmitt",
837 839 "email": "schmittjoh@gmail.com",
838   - "homepage": "https://github.com/schmittjoh",
  840 + "homepage": "http://jmsyst.com",
839 841 "role": "Developer of wrapped JMSSerializerBundle"
840 842 }
841 843 ],
... ... @@ -887,9 +889,9 @@
887 889 "email": "roman@code-factory.org"
888 890 },
889 891 {
890   - "name": "Johannes M. Schmitt",
  892 + "name": "Johannes Schmitt",
891 893 "email": "schmittjoh@gmail.com",
892   - "homepage": "https://github.com/schmittjoh",
  894 + "homepage": "http://jmsyst.com",
893 895 "role": "Developer of wrapped JMSSerializerBundle"
894 896 }
895 897 ],
... ... @@ -907,12 +909,12 @@
907 909 "source": {
908 910 "type": "git",
909 911 "url": "https://github.com/doctrine/migrations.git",
910   - "reference": "46a031ddaea47d0685200027cfe8c83b02aee6f6"
  912 + "reference": "4256449c5e2603a6b6ee5a78c7c4521d4d4430b8"
911 913 },
912 914 "dist": {
913 915 "type": "zip",
914   - "url": "https://api.github.com/repos/doctrine/migrations/zipball/46a031ddaea47d0685200027cfe8c83b02aee6f6",
915   - "reference": "46a031ddaea47d0685200027cfe8c83b02aee6f6",
  916 + "url": "https://api.github.com/repos/doctrine/migrations/zipball/4256449c5e2603a6b6ee5a78c7c4521d4d4430b8",
  917 + "reference": "4256449c5e2603a6b6ee5a78c7c4521d4d4430b8",
916 918 "shasum": ""
917 919 },
918 920 "require": {
... ... @@ -959,20 +961,20 @@
959 961 "database",
960 962 "migrations"
961 963 ],
962   - "time": "2014-03-16 19:02:43"
  964 + "time": "2014-07-09 07:58:02"
963 965 },
964 966 {
965 967 "name": "doctrine/orm",
966   - "version": "2.3.5",
  968 + "version": "v2.3.6",
967 969 "source": {
968 970 "type": "git",
969 971 "url": "https://github.com/doctrine/doctrine2.git",
970   - "reference": "2c31ec4809a28a549bf22d7cb7504add98156cd6"
  972 + "reference": "c2135b38216c6c8a410e764792aa368e946f2ae5"
971 973 },
972 974 "dist": {
973 975 "type": "zip",
974   - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2c31ec4809a28a549bf22d7cb7504add98156cd6",
975   - "reference": "2c31ec4809a28a549bf22d7cb7504add98156cd6",
  976 + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/c2135b38216c6c8a410e764792aa368e946f2ae5",
  977 + "reference": "c2135b38216c6c8a410e764792aa368e946f2ae5",
976 978 "shasum": ""
977 979 },
978 980 "require": {
... ... @@ -1030,7 +1032,7 @@
1030 1032 "database",
1031 1033 "orm"
1032 1034 ],
1033   - "time": "2014-02-08 16:28:24"
  1035 + "time": "2014-06-03 19:53:45"
1034 1036 },
1035 1037 {
1036 1038 "name": "friendsofsymfony/rest-bundle",
... ... @@ -1039,12 +1041,12 @@
1039 1041 "source": {
1040 1042 "type": "git",
1041 1043 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
1042   - "reference": "6b384c108fa89a5ace02124d200bd916ab5ac380"
  1044 + "reference": "5e91023b941cb11d8ac09c46405a4aa1920ca217"
1043 1045 },
1044 1046 "dist": {
1045 1047 "type": "zip",
1046   - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/6b384c108fa89a5ace02124d200bd916ab5ac380",
1047   - "reference": "6b384c108fa89a5ace02124d200bd916ab5ac380",
  1048 + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/5e91023b941cb11d8ac09c46405a4aa1920ca217",
  1049 + "reference": "5e91023b941cb11d8ac09c46405a4aa1920ca217",
1048 1050 "shasum": ""
1049 1051 },
1050 1052 "require": {
... ... @@ -1100,8 +1102,7 @@
1100 1102 },
1101 1103 {
1102 1104 "name": "Konstantin Kudryashov",
1103   - "email": "ever.zet@gmail.com",
1104   - "homepage": "http://everzet.com"
  1105 + "email": "ever.zet@gmail.com"
1105 1106 }
1106 1107 ],
1107 1108 "description": "This Bundle provides various tools to rapidly develop RESTful API's with Symfony2",
... ... @@ -1109,21 +1110,21 @@
1109 1110 "keywords": [
1110 1111 "rest"
1111 1112 ],
1112   - "time": "2014-05-27 08:47:40"
  1113 + "time": "2014-08-02 13:36:07"
1113 1114 },
1114 1115 {
1115 1116 "name": "helios-ag/fm-elfinder-bundle",
1116   - "version": "1.4.2",
  1117 + "version": "1.5",
1117 1118 "target-dir": "FM/ElfinderBundle",
1118 1119 "source": {
1119 1120 "type": "git",
1120 1121 "url": "https://github.com/helios-ag/FMElfinderBundle.git",
1121   - "reference": "6f2cd74ee288ccd11cae169ab2bf002f231ba83c"
  1122 + "reference": "57de87e1bf72f9a87fa1d7cd508e7857a3d03860"
1122 1123 },
1123 1124 "dist": {
1124 1125 "type": "zip",
1125   - "url": "https://api.github.com/repos/helios-ag/FMElfinderBundle/zipball/6f2cd74ee288ccd11cae169ab2bf002f231ba83c",
1126   - "reference": "6f2cd74ee288ccd11cae169ab2bf002f231ba83c",
  1126 + "url": "https://api.github.com/repos/helios-ag/FMElfinderBundle/zipball/57de87e1bf72f9a87fa1d7cd508e7857a3d03860",
  1127 + "reference": "57de87e1bf72f9a87fa1d7cd508e7857a3d03860",
1127 1128 "shasum": ""
1128 1129 },
1129 1130 "require": {
... ... @@ -1149,7 +1150,7 @@
1149 1150 ],
1150 1151 "authors": [
1151 1152 {
1152   - "name": "Albert Ganiev",
  1153 + "name": "Al Ganiev",
1153 1154 "email": "helios.ag@gmail.com"
1154 1155 },
1155 1156 {
... ... @@ -1163,7 +1164,7 @@
1163 1164 "elfinder",
1164 1165 "file manager"
1165 1166 ],
1166   - "time": "2013-12-19 07:59:20"
  1167 + "time": "2014-05-09 12:02:28"
1167 1168 },
1168 1169 {
1169 1170 "name": "helios-ag/fm-elfinder-php-connector",
... ... @@ -1194,7 +1195,7 @@
1194 1195 ],
1195 1196 "authors": [
1196 1197 {
1197   - "name": "Albert Ganiev",
  1198 + "name": "Al Ganiev",
1198 1199 "email": "helios.ag@gmail.com"
1199 1200 },
1200 1201 {
... ... @@ -1397,7 +1398,7 @@
1397 1398 {
1398 1399 "name": "Johannes M. Schmitt",
1399 1400 "email": "schmittjoh@gmail.com",
1400   - "homepage": "https://github.com/schmittjoh",
  1401 + "homepage": "http://jmsyst.com",
1401 1402 "role": "Developer of wrapped JMSSerializerBundle"
1402 1403 }
1403 1404 ],
... ... @@ -1504,7 +1505,7 @@
1504 1505 {
1505 1506 "name": "Johannes M. Schmitt",
1506 1507 "email": "schmittjoh@gmail.com",
1507   - "homepage": "https://github.com/schmittjoh",
  1508 + "homepage": "http://jmsyst.com",
1508 1509 "role": "Developer of wrapped JMSSerializerBundle"
1509 1510 }
1510 1511 ],
... ... @@ -1518,16 +1519,16 @@
1518 1519 },
1519 1520 {
1520 1521 "name": "jms/metadata",
1521   - "version": "1.5.0",
  1522 + "version": "1.5.1",
1522 1523 "source": {
1523 1524 "type": "git",
1524 1525 "url": "https://github.com/schmittjoh/metadata.git",
1525   - "reference": "88ffa28bc987e4c26229fc84a2e541b6ed4e1459"
  1526 + "reference": "22b72455559a25777cfd28c4ffda81ff7639f353"
1526 1527 },
1527 1528 "dist": {
1528 1529 "type": "zip",
1529   - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/88ffa28bc987e4c26229fc84a2e541b6ed4e1459",
1530   - "reference": "88ffa28bc987e4c26229fc84a2e541b6ed4e1459",
  1530 + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/22b72455559a25777cfd28c4ffda81ff7639f353",
  1531 + "reference": "22b72455559a25777cfd28c4ffda81ff7639f353",
1531 1532 "shasum": ""
1532 1533 },
1533 1534 "require": {
... ... @@ -1555,7 +1556,7 @@
1555 1556 {
1556 1557 "name": "Johannes M. Schmitt",
1557 1558 "email": "schmittjoh@gmail.com",
1558   - "homepage": "https://github.com/schmittjoh",
  1559 + "homepage": "http://jmsyst.com",
1559 1560 "role": "Developer of wrapped JMSSerializerBundle"
1560 1561 }
1561 1562 ],
... ... @@ -1566,7 +1567,7 @@
1566 1567 "xml",
1567 1568 "yaml"
1568 1569 ],
1569   - "time": "2013-11-05 23:02:36"
  1570 + "time": "2014-07-12 07:13:19"
1570 1571 },
1571 1572 {
1572 1573 "name": "jms/parser-lib",
... ... @@ -1659,7 +1660,7 @@
1659 1660 {
1660 1661 "name": "Johannes M. Schmitt",
1661 1662 "email": "schmittjoh@gmail.com",
1662   - "homepage": "https://github.com/schmittjoh",
  1663 + "homepage": "http://jmsyst.com",
1663 1664 "role": "Developer of wrapped JMSSerializerBundle"
1664 1665 }
1665 1666 ],
... ... @@ -1729,7 +1730,7 @@
1729 1730 {
1730 1731 "name": "Johannes M. Schmitt",
1731 1732 "email": "schmittjoh@gmail.com",
1732   - "homepage": "https://github.com/schmittjoh",
  1733 + "homepage": "http://jmsyst.com",
1733 1734 "role": "Developer of wrapped JMSSerializerBundle"
1734 1735 }
1735 1736 ],
... ... @@ -1751,12 +1752,12 @@
1751 1752 "source": {
1752 1753 "type": "git",
1753 1754 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
1754   - "reference": "ca66cd3ace6bea5367838c6dfb00a6a0bacb8a79"
  1755 + "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc"
1755 1756 },
1756 1757 "dist": {
1757 1758 "type": "zip",
1758   - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/ca66cd3ace6bea5367838c6dfb00a6a0bacb8a79",
1759   - "reference": "ca66cd3ace6bea5367838c6dfb00a6a0bacb8a79",
  1759 + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/55bb8fc449c626ab8d47d58fa13fd37f84376dfc",
  1760 + "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc",
1760 1761 "shasum": ""
1761 1762 },
1762 1763 "require": {
... ... @@ -1799,7 +1800,7 @@
1799 1800 {
1800 1801 "name": "Johannes M. Schmitt",
1801 1802 "email": "schmittjoh@gmail.com",
1802   - "homepage": "https://github.com/schmittjoh",
  1803 + "homepage": "http://jmsyst.com",
1803 1804 "role": "Developer of wrapped JMSSerializerBundle"
1804 1805 }
1805 1806 ],
... ... @@ -1812,7 +1813,7 @@
1812 1813 "serialization",
1813 1814 "xml"
1814 1815 ],
1815   - "time": "2014-02-09 12:04:09"
  1816 + "time": "2014-07-08 16:41:25"
1816 1817 },
1817 1818 {
1818 1819 "name": "jms/translation-bundle",
... ... @@ -1870,7 +1871,7 @@
1870 1871 {
1871 1872 "name": "Johannes M. Schmitt",
1872 1873 "email": "schmittjoh@gmail.com",
1873   - "homepage": "https://github.com/schmittjoh",
  1874 + "homepage": "http://jmsyst.com",
1874 1875 "role": "Developer of wrapped JMSSerializerBundle"
1875 1876 }
1876 1877 ],
... ... @@ -2104,7 +2105,7 @@
2104 2105 "email": "stof@notk.org"
2105 2106 },
2106 2107 {
2107   - "name": "KnpLabs",
  2108 + "name": "Knplabs",
2108 2109 "homepage": "http://knplabs.com"
2109 2110 },
2110 2111 {
... ... @@ -2125,12 +2126,12 @@
2125 2126 "source": {
2126 2127 "type": "git",
2127 2128 "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git",
2128   - "reference": "8067a1b46260c619ae8f3ffa3c32a612ff04924c"
  2129 + "reference": "d35547a771a03923d19d55ea335cd2801ad72dc2"
2129 2130 },
2130 2131 "dist": {
2131 2132 "type": "zip",
2132   - "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/8067a1b46260c619ae8f3ffa3c32a612ff04924c",
2133   - "reference": "8067a1b46260c619ae8f3ffa3c32a612ff04924c",
  2133 + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/d35547a771a03923d19d55ea335cd2801ad72dc2",
  2134 + "reference": "d35547a771a03923d19d55ea335cd2801ad72dc2",
2134 2135 "shasum": ""
2135 2136 },
2136 2137 "require": {
... ... @@ -2175,7 +2176,7 @@
2175 2176 "pagination",
2176 2177 "paginator"
2177 2178 ],
2178   - "time": "2014-05-13 07:26:35"
  2179 + "time": "2014-07-18 12:20:39"
2179 2180 },
2180 2181 {
2181 2182 "name": "kriswallsmith/assetic",
... ... @@ -2296,12 +2297,12 @@
2296 2297 "source": {
2297 2298 "type": "git",
2298 2299 "url": "https://github.com/lightbase/cocar.git",
2299   - "reference": "dc673a78aa4d15ec040647e6438cdc89bed7a8f5"
  2300 + "reference": "c9cabf7119e18a49956edae87996dded77e213d2"
2300 2301 },
2301 2302 "dist": {
2302 2303 "type": "zip",
2303   - "url": "https://api.github.com/repos/lightbase/cocar/zipball/dc673a78aa4d15ec040647e6438cdc89bed7a8f5",
2304   - "reference": "dc673a78aa4d15ec040647e6438cdc89bed7a8f5",
  2304 + "url": "https://api.github.com/repos/lightbase/cocar/zipball/c9cabf7119e18a49956edae87996dded77e213d2",
  2305 + "reference": "c9cabf7119e18a49956edae87996dded77e213d2",
2305 2306 "shasum": ""
2306 2307 },
2307 2308 "require": {
... ... @@ -2332,20 +2333,20 @@
2332 2333 "support": {
2333 2334 "source": "https://github.com/lightbase/cocar/tree/master"
2334 2335 },
2335   - "time": "2014-05-27 13:07:44"
  2336 + "time": "2014-08-01 13:34:45"
2336 2337 },
2337 2338 {
2338 2339 "name": "monolog/monolog",
2339   - "version": "1.9.1",
  2340 + "version": "1.10.0",
2340 2341 "source": {
2341 2342 "type": "git",
2342 2343 "url": "https://github.com/Seldaek/monolog.git",
2343   - "reference": "65026b610f8c19e61d7242f600530677b0466aac"
  2344 + "reference": "25b16e801979098cb2f120e697bfce454b18bf23"
2344 2345 },
2345 2346 "dist": {
2346 2347 "type": "zip",
2347   - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/65026b610f8c19e61d7242f600530677b0466aac",
2348   - "reference": "65026b610f8c19e61d7242f600530677b0466aac",
  2348 + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/25b16e801979098cb2f120e697bfce454b18bf23",
  2349 + "reference": "25b16e801979098cb2f120e697bfce454b18bf23",
2349 2350 "shasum": ""
2350 2351 },
2351 2352 "require": {
... ... @@ -2373,7 +2374,7 @@
2373 2374 "type": "library",
2374 2375 "extra": {
2375 2376 "branch-alias": {
2376   - "dev-master": "1.9.x-dev"
  2377 + "dev-master": "1.10.x-dev"
2377 2378 }
2378 2379 },
2379 2380 "autoload": {
... ... @@ -2400,7 +2401,7 @@
2400 2401 "logging",
2401 2402 "psr-3"
2402 2403 ],
2403   - "time": "2014-04-24 13:29:03"
  2404 + "time": "2014-06-04 16:30:04"
2404 2405 },
2405 2406 {
2406 2407 "name": "nikic/php-parser",
... ... @@ -2482,7 +2483,7 @@
2482 2483 {
2483 2484 "name": "Johannes M. Schmitt",
2484 2485 "email": "schmittjoh@gmail.com",
2485   - "homepage": "https://github.com/schmittjoh",
  2486 + "homepage": "http://jmsyst.com",
2486 2487 "role": "Developer of wrapped JMSSerializerBundle"
2487 2488 }
2488 2489 ],
... ... @@ -2532,7 +2533,7 @@
2532 2533 {
2533 2534 "name": "Johannes M. Schmitt",
2534 2535 "email": "schmittjoh@gmail.com",
2535   - "homepage": "https://github.com/schmittjoh",
  2536 + "homepage": "http://jmsyst.com",
2536 2537 "role": "Developer of wrapped JMSSerializerBundle"
2537 2538 }
2538 2539 ],
... ... @@ -2682,17 +2683,17 @@
2682 2683 },
2683 2684 {
2684 2685 "name": "sensio/generator-bundle",
2685   - "version": "v2.3.4",
  2686 + "version": "v2.3.5",
2686 2687 "target-dir": "Sensio/Bundle/GeneratorBundle",
2687 2688 "source": {
2688 2689 "type": "git",
2689 2690 "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
2690   - "reference": "4a7b126e9c22f858e3584b19ddce6e5bdd7677ee"
  2691 + "reference": "8b7a33aa3d22388443b6de0b0cf184122e9f60d2"
2691 2692 },
2692 2693 "dist": {
2693 2694 "type": "zip",
2694   - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4a7b126e9c22f858e3584b19ddce6e5bdd7677ee",
2695   - "reference": "4a7b126e9c22f858e3584b19ddce6e5bdd7677ee",
  2695 + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/8b7a33aa3d22388443b6de0b0cf184122e9f60d2",
  2696 + "reference": "8b7a33aa3d22388443b6de0b0cf184122e9f60d2",
2696 2697 "shasum": ""
2697 2698 },
2698 2699 "require": {
... ... @@ -2728,20 +2729,20 @@
2728 2729 }
2729 2730 ],
2730 2731 "description": "This bundle generates code for you",
2731   - "time": "2013-08-21 18:09:35"
  2732 + "time": "2014-04-28 14:01:06"
2732 2733 },
2733 2734 {
2734 2735 "name": "swiftmailer/swiftmailer",
2735   - "version": "v5.2.0",
  2736 + "version": "v5.2.1",
2736 2737 "source": {
2737 2738 "type": "git",
2738 2739 "url": "https://github.com/swiftmailer/swiftmailer.git",
2739   - "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48"
  2740 + "reference": "2b9af56cc676c338d52fca4c657e5bdff73bb7af"
2740 2741 },
2741 2742 "dist": {
2742 2743 "type": "zip",
2743   - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/043e336b871f17a117f76ef8e190eddfc04c8d48",
2744   - "reference": "043e336b871f17a117f76ef8e190eddfc04c8d48",
  2744 + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/2b9af56cc676c338d52fca4c657e5bdff73bb7af",
  2745 + "reference": "2b9af56cc676c338d52fca4c657e5bdff73bb7af",
2745 2746 "shasum": ""
2746 2747 },
2747 2748 "require": {
... ... @@ -2782,7 +2783,7 @@
2782 2783 "mail",
2783 2784 "mailer"
2784 2785 ],
2785   - "time": "2014-05-08 08:11:19"
  2786 + "time": "2014-06-13 11:44:54"
2786 2787 },
2787 2788 {
2788 2789 "name": "symfony/assetic-bundle",
... ... @@ -2901,20 +2902,21 @@
2901 2902 },
2902 2903 {
2903 2904 "name": "symfony/icu",
2904   - "version": "v1.2.1",
  2905 + "version": "v1.2.2",
2905 2906 "target-dir": "Symfony/Component/Icu",
2906 2907 "source": {
2907 2908 "type": "git",
2908 2909 "url": "https://github.com/symfony/Icu.git",
2909   - "reference": "98e197da54df1f966dd5e8a4992135703569c987"
  2910 + "reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a"
2910 2911 },
2911 2912 "dist": {
2912 2913 "type": "zip",
2913   - "url": "https://api.github.com/repos/symfony/Icu/zipball/98e197da54df1f966dd5e8a4992135703569c987",
2914   - "reference": "98e197da54df1f966dd5e8a4992135703569c987",
  2914 + "url": "https://api.github.com/repos/symfony/Icu/zipball/d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
  2915 + "reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
2915 2916 "shasum": ""
2916 2917 },
2917 2918 "require": {
  2919 + "ext-intl": "*",
2918 2920 "lib-icu": ">=4.4",
2919 2921 "php": ">=5.3.3",
2920 2922 "symfony/intl": "~2.3"
... ... @@ -2945,7 +2947,7 @@
2945 2947 "icu",
2946 2948 "intl"
2947 2949 ],
2948   - "time": "2013-10-04 10:06:38"
  2950 + "time": "2014-07-25 09:58:17"
2949 2951 },
2950 2952 {
2951 2953 "name": "symfony/monolog-bundle",
... ... @@ -3267,16 +3269,16 @@
3267 3269 },
3268 3270 {
3269 3271 "name": "twig/twig",
3270   - "version": "v1.15.1",
  3272 + "version": "v1.16.0",
3271 3273 "source": {
3272 3274 "type": "git",
3273 3275 "url": "https://github.com/fabpot/Twig.git",
3274   - "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed"
  3276 + "reference": "8ce37115802e257a984a82d38254884085060024"
3275 3277 },
3276 3278 "dist": {
3277 3279 "type": "zip",
3278   - "url": "https://api.github.com/repos/fabpot/Twig/zipball/1fb5784662f438d7d96a541e305e28b812e2eeed",
3279   - "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed",
  3280 + "url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024",
  3281 + "reference": "8ce37115802e257a984a82d38254884085060024",
3280 3282 "shasum": ""
3281 3283 },
3282 3284 "require": {
... ... @@ -3285,7 +3287,7 @@
3285 3287 "type": "library",
3286 3288 "extra": {
3287 3289 "branch-alias": {
3288   - "dev-master": "1.15-dev"
  3290 + "dev-master": "1.16-dev"
3289 3291 }
3290 3292 },
3291 3293 "autoload": {
... ... @@ -3305,7 +3307,7 @@
3305 3307 "role": "Lead Developer"
3306 3308 },
3307 3309 {
3308   - "name": "Armin Ronacher",
  3310 + "name": "Armin Ronacher2",
3309 3311 "email": "armin.ronacher@active-4.com",
3310 3312 "role": "Project Founder"
3311 3313 },
... ... @@ -3320,7 +3322,7 @@
3320 3322 "keywords": [
3321 3323 "templating"
3322 3324 ],
3323   - "time": "2014-02-13 10:19:29"
  3325 + "time": "2014-07-05 12:19:05"
3324 3326 },
3325 3327 {
3326 3328 "name": "willdurand/jsonp-callback-validator",
... ... @@ -3354,7 +3356,7 @@
3354 3356 ],
3355 3357 "authors": [
3356 3358 {
3357   - "name": "William Durand",
  3359 + "name": "William DURAND",
3358 3360 "email": "william.durand1@gmail.com",
3359 3361 "homepage": "http://www.willdurand.fr"
3360 3362 }
... ... @@ -3432,10 +3434,12 @@
3432 3434 "jms/serializer": 20,
3433 3435 "jms/serializer-bundle": 20,
3434 3436 "lightbase/cocar": 20,
  3437 + "ddeboer/data-import": 20,
3435 3438 "ddeboer/data-import-bundle": 20,
3436 3439 "doctrine/migrations": 20,
3437 3440 "doctrine/doctrine-migrations-bundle": 20
3438 3441 },
  3442 + "prefer-stable": false,
3439 3443 "platform": {
3440 3444 "php": ">=5.3.3"
3441 3445 },
... ...
src/Cacic/CommonBundle/DoctrineMigrations/Version20140424182701.php
  Diff comments   View file @d413a14
... ... @@ -23,6 +23,7 @@ class Version20140424182701 extends AbstractMigration implements ContainerAwareI
23 23 {
24 24 // this up() migration is auto-generated, please modify it to your needs
25 25 $this->abortIf($this->connection->getDatabasePlatform()->getName() != "postgresql", "Migration can only be executed safely on 'postgresql'.");
  26 + $sm = $this->connection->getSchemaManager();
26 27  
27 28 $logger = $this->container->get('logger');
28 29 $rootDir = $this->container->get('kernel')->getRootDir();
... ... @@ -30,7 +31,11 @@ class Version20140424182701 extends AbstractMigration implements ContainerAwareI
30 31 $upgradeSQL1 = file_get_contents($upgrade1);
31 32  
32 33 // Altera o modelo de dados
33   - $this->addSql("ALTER TABLE computador_coleta ADD dt_hr_inclusao TIMESTAMP(0) WITHOUT TIME ZONE");
  34 + $columns = $sm->listTableColumns('computador_coleta');
  35 + if (!array_key_exists('dt_hr_inclusao', $columns)) {
  36 + $logger->debug("Adicionando coluna dt_hr_inclusao na tabela computador_coleta");
  37 + $this->addSql("ALTER TABLE computador_coleta ADD dt_hr_inclusao TIMESTAMP(0) WITHOUT TIME ZONE");
  38 + }
34 39  
35 40 $logger->debug("Arquivo de atualização: $upgrade1");
36 41  
... ...
src/Cacic/CommonBundle/DoctrineMigrations/Version20140801004047.php 0 → 100644
  Diff comments   View file @d413a14
... ... @@ -0,0 +1,79 @@
  1 +<?php
  2 +
  3 +namespace Cacic\CommonBundle\Migrations;
  4 +
  5 +use Symfony\Component\DependencyInjection\ContainerAwareInterface;
  6 +use Symfony\Component\DependencyInjection\ContainerInterface;
  7 +use Doctrine\DBAL\Migrations\AbstractMigration;
  8 +use Doctrine\DBAL\Schema\Schema;
  9 +
  10 +/**
  11 + * Auto-generated Migration: Please modify to your needs!
  12 + */
  13 +class Version20140801004047 extends AbstractMigration implements ContainerAwareInterface
  14 +{
  15 + private $container;
  16 +
  17 + public function setContainer(ContainerInterface $container = null)
  18 + {
  19 + $this->container = $container;
  20 + }
  21 +
  22 + public function up(Schema $schema)
  23 + {
  24 + // this up() migration is auto-generated, please modify it to your needs
  25 + $this->abortIf($this->connection->getDatabasePlatform()->getName() != "postgresql", "Migration can only be executed safely on 'postgresql'.");
  26 + $logger = $this->container->get('logger');
  27 +
  28 + // Função de atualização da tabela de impressoras
  29 + $this->addSql("
  30 + CREATE OR REPLACE FUNCTION conserta_impressoras() RETURNS VOID AS $$
  31 +DECLARE
  32 + impr record;
  33 + v_id integer;
  34 +BEGIN
  35 + FOR impr IN select count(id) as impr,
  36 + date,
  37 + printer_id
  38 + from tb_printer_counter
  39 + group by date,
  40 + printer_id
  41 + having count(id) > 1 LOOP
  42 +
  43 + SELECT max(id) INTO v_id
  44 + FROM tb_printer_counter
  45 + WHERE date = impr.date
  46 + AND printer_id = impr.printer_id;
  47 +
  48 + RAISE NOTICE 'Removing log id = % printer_id = % date = %',v_id,impr.printer_id,impr.date;
  49 +
  50 + DELETE FROM tb_printer_counter
  51 + WHERE id <> v_id
  52 + AND date = impr.date
  53 + AND printer_id = impr.printer_id;
  54 +
  55 + END LOOP;
  56 +
  57 + RETURN;
  58 +END;
  59 +$$ LANGUAGE 'plpgsql';
  60 + ");
  61 +
  62 + $logger->info("Função de atualização das impressoras criada");
  63 +
  64 + $this->addSql("SELECT conserta_impressoras();");
  65 +
  66 + $logger->info("Impressoras arrumadas");
  67 +
  68 + $this->addSql("create unique index tb_printer_counter_date_uq on tb_printer_counter (date, printer_id);");
  69 +
  70 + $logger->info("Índice único criado");
  71 +
  72 + }
  73 +
  74 + public function down(Schema $schema)
  75 + {
  76 + // this down() migration is auto-generated, please modify it to your needs
  77 +
  78 + }
  79 +}
... ...