Download as
Browse Code »

Commit 4200361bc3e4ae68f4c8e9ea805f2748376897cd

Authored by Eduardo Santos
Committed by Eduardo Santos
1 parent d2b85652
Exists in master and in 1 other branch 3.1

Pequena atualização para corrigir o upgrade.

Showing 6 changed files with 387 additions and 97 deletions   Show diff stats
app/AppKernel.php
  Diff comments   View file @4200361
@@ -30,7 +30,8 @@ class AppKernel extends Kernel @@ -30,7 +30,8 @@ class AppKernel extends Kernel
30 new FM\ElfinderBundle\FMElfinderBundle(), 30 new FM\ElfinderBundle\FMElfinderBundle(),
31 new Knp\Bundle\MenuBundle\KnpMenuBundle(), 31 new Knp\Bundle\MenuBundle\KnpMenuBundle(),
32 new Swpb\Bundle\CocarBundle\CocarBundle(), 32 new Swpb\Bundle\CocarBundle\CocarBundle(),
33 - new Ddeboer\DataImportBundle\DdeboerDataImportBundle() 33 + new Ddeboer\DataImportBundle\DdeboerDataImportBundle(),
  34 + new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
34 ); 35 );
35 36
36 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 37 if (in_array($this->getEnvironment(), array('dev', 'test'))) {
app/config/config.yml
  Diff comments   View file @4200361
@@ -161,6 +161,12 @@ jms_translation: @@ -161,6 +161,12 @@ jms_translation:
161 excluded_dirs: [Common, Entity, Form] 161 excluded_dirs: [Common, Entity, Form]
162 #extractors: [alias_of_the_extractor] 162 #extractors: [alias_of_the_extractor]
163 163
  164 +doctrine_migrations:
  165 + dir_name: %kernel.root_dir%/../src/Cacic/CommonBundle/DoctrineMigrations
  166 + namespace: Cacic\CommonBundle\Migrations
  167 + table_name: migration_versions
  168 + name: Cacic Migrations
  169 +
164 services: 170 services:
165 twig.text_extension: 171 twig.text_extension:
166 class: Twig_Extensions_Extension_Text 172 class: Twig_Extensions_Extension_Text
@@ -57,7 +57,9 @@ @@ -57,7 +57,9 @@
57 "jms/serializer-bundle": "0.13.*@dev", 57 "jms/serializer-bundle": "0.13.*@dev",
58 "lightbase/cocar": "dev-master", 58 "lightbase/cocar": "dev-master",
59 "ddeboer/data-import-bundle": "dev-master", 59 "ddeboer/data-import-bundle": "dev-master",
60 - "twbs/bootstrap": "3.0.*" 60 + "twbs/bootstrap": "3.0.*",
  61 + "doctrine/migrations": "dev-master",
  62 + "doctrine/doctrine-migrations-bundle": "dev-master"
61 }, 63 },
62 "scripts": { 64 "scripts": {
63 "post-install-cmd": [ 65 "post-install-cmd": [
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 "This file locks the dependencies of your project to a known state", 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 ], 5 ],
6 - "hash": "2374f22cb735f9931567e2668cf40380", 6 + "hash": "2fe980152192889d593d2faedb57d239",
7 "packages": [ 7 "packages": [
8 { 8 {
9 "name": "braincrafted/bootstrap-bundle", 9 "name": "braincrafted/bootstrap-bundle",
@@ -217,9 +217,10 @@ @@ -217,9 +217,10 @@
217 ], 217 ],
218 "authors": [ 218 "authors": [
219 { 219 {
220 - "name": "Jonathan Wage", 220 + "name": "Jonathan H. Wage",
221 "email": "jonwage@gmail.com", 221 "email": "jonwage@gmail.com",
222 - "homepage": "http://www.jwage.com/" 222 + "homepage": "http://www.jwage.com/",
  223 + "role": "Creator"
223 }, 224 },
224 { 225 {
225 "name": "Guilherme Blanco", 226 "name": "Guilherme Blanco",
@@ -291,7 +292,7 @@ @@ -291,7 +292,7 @@
291 ], 292 ],
292 "authors": [ 293 "authors": [
293 { 294 {
294 - "name": "Jonathan Wage", 295 + "name": "Jonathan H. Wage",
295 "email": "jonwage@gmail.com", 296 "email": "jonwage@gmail.com",
296 "homepage": "http://www.jwage.com/", 297 "homepage": "http://www.jwage.com/",
297 "role": "Creator" 298 "role": "Creator"
@@ -433,7 +434,8 @@ @@ -433,7 +434,8 @@
433 { 434 {
434 "name": "Jonathan Wage", 435 "name": "Jonathan Wage",
435 "email": "jonwage@gmail.com", 436 "email": "jonwage@gmail.com",
436 - "homepage": "http://www.jwage.com/" 437 + "homepage": "http://www.jwage.com/",
  438 + "role": "Creator"
437 }, 439 },
438 { 440 {
439 "name": "Guilherme Blanco", 441 "name": "Guilherme Blanco",
@@ -528,12 +530,12 @@ @@ -528,12 +530,12 @@
528 "source": { 530 "source": {
529 "type": "git", 531 "type": "git",
530 "url": "https://github.com/doctrine/dbal.git", 532 "url": "https://github.com/doctrine/dbal.git",
531 - "reference": "2.3.4" 533 + "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13"
532 }, 534 },
533 "dist": { 535 "dist": {
534 "type": "zip", 536 "type": "zip",
535 - "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4",  
536 - "reference": "2.3.4", 537 + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2a37b007dda8e21bdbb8fa445be8fa0064199e13",
  538 + "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13",
537 "shasum": "" 539 "shasum": ""
538 }, 540 },
539 "require": { 541 "require": {
@@ -559,7 +561,8 @@ @@ -559,7 +561,8 @@
559 { 561 {
560 "name": "Jonathan Wage", 562 "name": "Jonathan Wage",
561 "email": "jonwage@gmail.com", 563 "email": "jonwage@gmail.com",
562 - "homepage": "http://www.jwage.com/" 564 + "homepage": "http://www.jwage.com/",
  565 + "role": "Creator"
563 }, 566 },
564 { 567 {
565 "name": "Guilherme Blanco", 568 "name": "Guilherme Blanco",
@@ -592,25 +595,25 @@ @@ -592,25 +595,25 @@
592 "source": { 595 "source": {
593 "type": "git", 596 "type": "git",
594 "url": "https://github.com/doctrine/DoctrineBundle.git", 597 "url": "https://github.com/doctrine/DoctrineBundle.git",
595 - "reference": "v1.2.0" 598 + "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9"
596 }, 599 },
597 "dist": { 600 "dist": {
598 "type": "zip", 601 "type": "zip",
599 - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/v1.2.0",  
600 - "reference": "v1.2.0", 602 + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/765b0d87fcc3e839c74817b7211258cbef3a4fb9",
  603 + "reference": "765b0d87fcc3e839c74817b7211258cbef3a4fb9",
601 "shasum": "" 604 "shasum": ""
602 }, 605 },
603 "require": { 606 "require": {
604 "doctrine/dbal": ">=2.2,<2.5-dev", 607 "doctrine/dbal": ">=2.2,<2.5-dev",
605 - "jdorn/sql-formatter": ">=1.1,<2.0", 608 + "jdorn/sql-formatter": "~1.1",
606 "php": ">=5.3.2", 609 "php": ">=5.3.2",
607 - "symfony/doctrine-bridge": ">=2.2,<3.0",  
608 - "symfony/framework-bundle": ">=2.2,<3.0" 610 + "symfony/doctrine-bridge": "~2.2",
  611 + "symfony/framework-bundle": "~2.2"
609 }, 612 },
610 "require-dev": { 613 "require-dev": {
611 "doctrine/orm": ">=2.2,<2.5-dev", 614 "doctrine/orm": ">=2.2,<2.5-dev",
612 - "symfony/validator": ">=2.2,<3.0",  
613 - "symfony/yaml": ">=2.2,<3.0" 615 + "symfony/validator": "~2.2",
  616 + "symfony/yaml": "~2.2"
614 }, 617 },
615 "suggest": { 618 "suggest": {
616 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", 619 "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
@@ -634,7 +637,9 @@ @@ -634,7 +637,9 @@
634 "authors": [ 637 "authors": [
635 { 638 {
636 "name": "Fabien Potencier", 639 "name": "Fabien Potencier",
637 - "email": "fabien@symfony.com" 640 + "email": "fabien@symfony.com",
  641 + "homepage": "http://fabien.potencier.org",
  642 + "role": "Lead Developer"
638 }, 643 },
639 { 644 {
640 "name": "Symfony Community", 645 "name": "Symfony Community",
@@ -716,6 +721,67 @@ @@ -716,6 +721,67 @@
716 "time": "2014-03-05 01:11:31" 721 "time": "2014-03-05 01:11:31"
717 }, 722 },
718 { 723 {
  724 + "name": "doctrine/doctrine-migrations-bundle",
  725 + "version": "dev-master",
  726 + "target-dir": "Doctrine/Bundle/MigrationsBundle",
  727 + "source": {
  728 + "type": "git",
  729 + "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
  730 + "reference": "f7138381aa884c0f679da4de41e369b94ead9cd3"
  731 + },
  732 + "dist": {
  733 + "type": "zip",
  734 + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/f7138381aa884c0f679da4de41e369b94ead9cd3",
  735 + "reference": "f7138381aa884c0f679da4de41e369b94ead9cd3",
  736 + "shasum": ""
  737 + },
  738 + "require": {
  739 + "doctrine/doctrine-bundle": "~1.0",
  740 + "doctrine/migrations": "~1.0@dev",
  741 + "php": ">=5.3.2",
  742 + "symfony/framework-bundle": "~2.1"
  743 + },
  744 + "type": "symfony-bundle",
  745 + "extra": {
  746 + "branch-alias": {
  747 + "dev-master": "2.1.x-dev"
  748 + }
  749 + },
  750 + "autoload": {
  751 + "psr-0": {
  752 + "Doctrine\\Bundle\\MigrationsBundle": ""
  753 + }
  754 + },
  755 + "notification-url": "https://packagist.org/downloads/",
  756 + "license": [
  757 + "MIT"
  758 + ],
  759 + "authors": [
  760 + {
  761 + "name": "Fabien Potencier",
  762 + "email": "fabien@symfony.com",
  763 + "homepage": "http://fabien.potencier.org",
  764 + "role": "Lead Developer"
  765 + },
  766 + {
  767 + "name": "Symfony Community",
  768 + "homepage": "http://symfony.com/contributors"
  769 + },
  770 + {
  771 + "name": "Doctrine Project",
  772 + "homepage": "http://www.doctrine-project.org"
  773 + }
  774 + ],
  775 + "description": "Symfony DoctrineMigrationsBundle",
  776 + "homepage": "http://www.doctrine-project.org",
  777 + "keywords": [
  778 + "dbal",
  779 + "migrations",
  780 + "schema"
  781 + ],
  782 + "time": "2014-03-20 14:48:55"
  783 + },
  784 + {
719 "name": "doctrine/inflector", 785 "name": "doctrine/inflector",
720 "version": "v1.0", 786 "version": "v1.0",
721 "source": { 787 "source": {
@@ -746,7 +812,8 @@ @@ -746,7 +812,8 @@
746 { 812 {
747 "name": "Jonathan Wage", 813 "name": "Jonathan Wage",
748 "email": "jonwage@gmail.com", 814 "email": "jonwage@gmail.com",
749 - "homepage": "http://www.jwage.com/" 815 + "homepage": "http://www.jwage.com/",
  816 + "role": "Creator"
750 }, 817 },
751 { 818 {
752 "name": "Guilherme Blanco", 819 "name": "Guilherme Blanco",
@@ -762,7 +829,7 @@ @@ -762,7 +829,7 @@
762 "email": "kontakt@beberlei.de" 829 "email": "kontakt@beberlei.de"
763 }, 830 },
764 { 831 {
765 - "name": "Johannes M. Schmitt", 832 + "name": "Johannes Schmitt",
766 "email": "schmittjoh@gmail.com", 833 "email": "schmittjoh@gmail.com",
767 "homepage": "http://jmsyst.com", 834 "homepage": "http://jmsyst.com",
768 "role": "Developer of wrapped JMSSerializerBundle" 835 "role": "Developer of wrapped JMSSerializerBundle"
@@ -831,6 +898,66 @@ @@ -831,6 +898,66 @@
831 "time": "2013-01-12 18:59:04" 898 "time": "2013-01-12 18:59:04"
832 }, 899 },
833 { 900 {
  901 + "name": "doctrine/migrations",
  902 + "version": "dev-master",
  903 + "source": {
  904 + "type": "git",
  905 + "url": "https://github.com/doctrine/migrations.git",
  906 + "reference": "46a031ddaea47d0685200027cfe8c83b02aee6f6"
  907 + },
  908 + "dist": {
  909 + "type": "zip",
  910 + "url": "https://api.github.com/repos/doctrine/migrations/zipball/46a031ddaea47d0685200027cfe8c83b02aee6f6",
  911 + "reference": "46a031ddaea47d0685200027cfe8c83b02aee6f6",
  912 + "shasum": ""
  913 + },
  914 + "require": {
  915 + "doctrine/dbal": "~2.0",
  916 + "php": ">=5.3.2"
  917 + },
  918 + "require-dev": {
  919 + "symfony/console": "2.*",
  920 + "symfony/yaml": "2.*"
  921 + },
  922 + "suggest": {
  923 + "symfony/console": "to run the migration from the console"
  924 + },
  925 + "type": "library",
  926 + "extra": {
  927 + "branch-alias": {
  928 + "dev-master": "1.0.x-dev"
  929 + }
  930 + },
  931 + "autoload": {
  932 + "psr-0": {
  933 + "Doctrine\\DBAL\\Migrations": "lib"
  934 + }
  935 + },
  936 + "notification-url": "https://packagist.org/downloads/",
  937 + "license": [
  938 + "LGPL"
  939 + ],
  940 + "authors": [
  941 + {
  942 + "name": "Jonathan Wage",
  943 + "email": "jonwage@gmail.com",
  944 + "homepage": "http://www.jwage.com/",
  945 + "role": "Creator"
  946 + },
  947 + {
  948 + "name": "Benjamin Eberlei",
  949 + "email": "kontakt@beberlei.de"
  950 + }
  951 + ],
  952 + "description": "Database Schema migrations using Doctrine DBAL",
  953 + "homepage": "http://www.doctrine-project.org",
  954 + "keywords": [
  955 + "database",
  956 + "migrations"
  957 + ],
  958 + "time": "2014-03-16 19:02:43"
  959 + },
  960 + {
834 "name": "doctrine/orm", 961 "name": "doctrine/orm",
835 "version": "2.3.5", 962 "version": "2.3.5",
836 "source": { 963 "source": {
@@ -908,12 +1035,12 @@ @@ -908,12 +1035,12 @@
908 "source": { 1035 "source": {
909 "type": "git", 1036 "type": "git",
910 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", 1037 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
911 - "reference": "890829effff016b53f392d45702107a09e71edcf" 1038 + "reference": "6e5017a66437fdf54c88db75edeec25e4354b4f6"
912 }, 1039 },
913 "dist": { 1040 "dist": {
914 "type": "zip", 1041 "type": "zip",
915 - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/890829effff016b53f392d45702107a09e71edcf",  
916 - "reference": "890829effff016b53f392d45702107a09e71edcf", 1042 + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/6e5017a66437fdf54c88db75edeec25e4354b4f6",
  1043 + "reference": "6e5017a66437fdf54c88db75edeec25e4354b4f6",
917 "shasum": "" 1044 "shasum": ""
918 }, 1045 },
919 "require": { 1046 "require": {
@@ -940,7 +1067,8 @@ @@ -940,7 +1067,8 @@
940 "suggest": { 1067 "suggest": {
941 "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*", 1068 "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*",
942 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener", 1069 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener",
943 - "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.2" 1070 + "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.2",
  1071 + "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.2"
944 }, 1072 },
945 "type": "symfony-bundle", 1073 "type": "symfony-bundle",
946 "extra": { 1074 "extra": {
@@ -977,7 +1105,7 @@ @@ -977,7 +1105,7 @@
977 "keywords": [ 1105 "keywords": [
978 "rest" 1106 "rest"
979 ], 1107 ],
980 - "time": "2014-04-03 21:10:08" 1108 + "time": "2014-04-21 08:26:51"
981 }, 1109 },
982 { 1110 {
983 "name": "helios-ag/fm-elfinder-bundle", 1111 "name": "helios-ag/fm-elfinder-bundle",
@@ -1263,7 +1391,7 @@ @@ -1263,7 +1391,7 @@
1263 ], 1391 ],
1264 "authors": [ 1392 "authors": [
1265 { 1393 {
1266 - "name": "Johannes Schmitt", 1394 + "name": "Johannes M. Schmitt",
1267 "email": "schmittjoh@gmail.com", 1395 "email": "schmittjoh@gmail.com",
1268 "homepage": "http://jmsyst.com", 1396 "homepage": "http://jmsyst.com",
1269 "role": "Developer of wrapped JMSSerializerBundle" 1397 "role": "Developer of wrapped JMSSerializerBundle"
@@ -1281,13 +1409,13 @@ @@ -1281,13 +1409,13 @@
1281 "version": "1.0.0", 1409 "version": "1.0.0",
1282 "source": { 1410 "source": {
1283 "type": "git", 1411 "type": "git",
1284 - "url": "git://github.com/schmittjoh/cg-library.git",  
1285 - "reference": "1.0.0" 1412 + "url": "https://github.com/schmittjoh/cg-library.git",
  1413 + "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc"
1286 }, 1414 },
1287 "dist": { 1415 "dist": {
1288 "type": "zip", 1416 "type": "zip",
1289 - "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0",  
1290 - "reference": "1.0.0", 1417 + "url": "https://api.github.com/repos/schmittjoh/cg-library/zipball/ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc",
  1418 + "reference": "ce8ef43dd6bfe6ce54e5e9844ab71be2343bf2fc",
1291 "shasum": "" 1419 "shasum": ""
1292 }, 1420 },
1293 "require": { 1421 "require": {
@@ -1315,7 +1443,7 @@ @@ -1315,7 +1443,7 @@
1315 "keywords": [ 1443 "keywords": [
1316 "code generation" 1444 "code generation"
1317 ], 1445 ],
1318 - "time": "2012-01-02 12:40:52" 1446 + "time": "2012-01-02 20:40:52"
1319 }, 1447 },
1320 { 1448 {
1321 "name": "jms/di-extra-bundle", 1449 "name": "jms/di-extra-bundle",
@@ -1324,20 +1452,20 @@ @@ -1324,20 +1452,20 @@
1324 "source": { 1452 "source": {
1325 "type": "git", 1453 "type": "git",
1326 "url": "https://github.com/schmittjoh/JMSDiExtraBundle.git", 1454 "url": "https://github.com/schmittjoh/JMSDiExtraBundle.git",
1327 - "reference": "1.4.0" 1455 + "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070"
1328 }, 1456 },
1329 "dist": { 1457 "dist": {
1330 "type": "zip", 1458 "type": "zip",
1331 - "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/1.4.0",  
1332 - "reference": "1.4.0", 1459 + "url": "https://api.github.com/repos/schmittjoh/JMSDiExtraBundle/zipball/7fffdb6c96fb922a131af06d773e1e6c5301d070",
  1460 + "reference": "7fffdb6c96fb922a131af06d773e1e6c5301d070",
1333 "shasum": "" 1461 "shasum": ""
1334 }, 1462 },
1335 "require": { 1463 "require": {
1336 "jms/aop-bundle": ">=1.0.0,<1.2-dev", 1464 "jms/aop-bundle": ">=1.0.0,<1.2-dev",
1337 "jms/metadata": "1.*", 1465 "jms/metadata": "1.*",
1338 - "symfony/finder": ">=2.1,<3.0",  
1339 - "symfony/framework-bundle": ">=2.1,<3.0",  
1340 - "symfony/process": ">=2.1,<3.0" 1466 + "symfony/finder": "~2.1",
  1467 + "symfony/framework-bundle": "~2.1",
  1468 + "symfony/process": "~2.1"
1341 }, 1469 },
1342 "require-dev": { 1470 "require-dev": {
1343 "doctrine/doctrine-bundle": "*", 1471 "doctrine/doctrine-bundle": "*",
@@ -1421,7 +1549,7 @@ @@ -1421,7 +1549,7 @@
1421 ], 1549 ],
1422 "authors": [ 1550 "authors": [
1423 { 1551 {
1424 - "name": "Johannes Schmitt", 1552 + "name": "Johannes M. Schmitt",
1425 "email": "schmittjoh@gmail.com", 1553 "email": "schmittjoh@gmail.com",
1426 "homepage": "http://jmsyst.com", 1554 "homepage": "http://jmsyst.com",
1427 "role": "Developer of wrapped JMSSerializerBundle" 1555 "role": "Developer of wrapped JMSSerializerBundle"
@@ -1441,13 +1569,13 @@ @@ -1441,13 +1569,13 @@
1441 "version": "1.0.0", 1569 "version": "1.0.0",
1442 "source": { 1570 "source": {
1443 "type": "git", 1571 "type": "git",
1444 - "url": "git://github.com/schmittjoh/parser-lib",  
1445 - "reference": "1.0.0" 1572 + "url": "https://github.com/schmittjoh/parser-lib.git",
  1573 + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
1446 }, 1574 },
1447 "dist": { 1575 "dist": {
1448 "type": "zip", 1576 "type": "zip",
1449 - "url": "https://github.com/schmittjoh/parser-lib/archive/1.0.0.zip",  
1450 - "reference": "1.0.0", 1577 + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
  1578 + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
1451 "shasum": "" 1579 "shasum": ""
1452 }, 1580 },
1453 "require": { 1581 "require": {
@@ -1478,20 +1606,20 @@ @@ -1478,20 +1606,20 @@
1478 "source": { 1606 "source": {
1479 "type": "git", 1607 "type": "git",
1480 "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git", 1608 "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle.git",
1481 - "reference": "1.5.1" 1609 + "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc"
1482 }, 1610 },
1483 "dist": { 1611 "dist": {
1484 "type": "zip", 1612 "type": "zip",
1485 - "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/1.5.1",  
1486 - "reference": "1.5.1", 1613 + "url": "https://api.github.com/repos/schmittjoh/JMSSecurityExtraBundle/zipball/f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc",
  1614 + "reference": "f5f6c6df69ceae8b709e57b49fcc2a42d9280bcc",
1487 "shasum": "" 1615 "shasum": ""
1488 }, 1616 },
1489 "require": { 1617 "require": {
1490 - "jms/aop-bundle": ">=1.0,<2.0",  
1491 - "jms/di-extra-bundle": ">=1.3,<2.0",  
1492 - "jms/metadata": ">=1.0,<2.0",  
1493 - "jms/parser-lib": ">=1.0,<2.0",  
1494 - "symfony/framework-bundle": ">=2.1,<3.0", 1618 + "jms/aop-bundle": "~1.0",
  1619 + "jms/di-extra-bundle": "~1.3",
  1620 + "jms/metadata": "~1.0",
  1621 + "jms/parser-lib": "~1.0",
  1622 + "symfony/framework-bundle": "~2.1",
1495 "symfony/security-bundle": "*" 1623 "symfony/security-bundle": "*"
1496 }, 1624 },
1497 "require-dev": { 1625 "require-dev": {
@@ -1738,7 +1866,7 @@ @@ -1738,7 +1866,7 @@
1738 { 1866 {
1739 "name": "Johannes M. Schmitt", 1867 "name": "Johannes M. Schmitt",
1740 "email": "schmittjoh@gmail.com", 1868 "email": "schmittjoh@gmail.com",
1741 - "homepage": "http://jmsyst.com", 1869 + "homepage": "https://github.com/schmittjoh",
1742 "role": "Developer of wrapped JMSSerializerBundle" 1870 "role": "Developer of wrapped JMSSerializerBundle"
1743 } 1871 }
1744 ], 1872 ],
@@ -2051,17 +2179,17 @@ @@ -2051,17 +2179,17 @@
2051 "source": { 2179 "source": {
2052 "type": "git", 2180 "type": "git",
2053 "url": "https://github.com/kriswallsmith/assetic.git", 2181 "url": "https://github.com/kriswallsmith/assetic.git",
2054 - "reference": "v1.1.1" 2182 + "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec"
2055 }, 2183 },
2056 "dist": { 2184 "dist": {
2057 "type": "zip", 2185 "type": "zip",
2058 - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/v1.1.1",  
2059 - "reference": "v1.1.1", 2186 + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/a826e4b96f5c607ff47ef61caf3826b2b1e840ec",
  2187 + "reference": "a826e4b96f5c607ff47ef61caf3826b2b1e840ec",
2060 "shasum": "" 2188 "shasum": ""
2061 }, 2189 },
2062 "require": { 2190 "require": {
2063 "php": ">=5.3.1", 2191 "php": ">=5.3.1",
2064 - "symfony/process": ">=2.1,<3.0" 2192 + "symfony/process": "~2.1"
2065 }, 2193 },
2066 "require-dev": { 2194 "require-dev": {
2067 "cssmin/cssmin": "*", 2195 "cssmin/cssmin": "*",
@@ -2071,9 +2199,9 @@ @@ -2071,9 +2199,9 @@
2071 "leafo/scssphp": "*", 2199 "leafo/scssphp": "*",
2072 "leafo/scssphp-compass": "*", 2200 "leafo/scssphp-compass": "*",
2073 "mrclay/minify": "*", 2201 "mrclay/minify": "*",
2074 - "phpunit/phpunit": ">=3.7,<4.0", 2202 + "phpunit/phpunit": "~3.7",
2075 "ptachoire/cssembed": "*", 2203 "ptachoire/cssembed": "*",
2076 - "twig/twig": ">=1.6,<2.0" 2204 + "twig/twig": "~1.6"
2077 }, 2205 },
2078 "suggest": { 2206 "suggest": {
2079 "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", 2207 "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
@@ -2204,16 +2332,16 @@ @@ -2204,16 +2332,16 @@
2204 }, 2332 },
2205 { 2333 {
2206 "name": "monolog/monolog", 2334 "name": "monolog/monolog",
2207 - "version": "1.8.0", 2335 + "version": "1.9.0",
2208 "source": { 2336 "source": {
2209 "type": "git", 2337 "type": "git",
2210 "url": "https://github.com/Seldaek/monolog.git", 2338 "url": "https://github.com/Seldaek/monolog.git",
2211 - "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174" 2339 + "reference": "1afc39690e7414412face1f8cbf67b73db34485c"
2212 }, 2340 },
2213 "dist": { 2341 "dist": {
2214 "type": "zip", 2342 "type": "zip",
2215 - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/392ef35fd470638e08d0160d6b1cbab63cb23174",  
2216 - "reference": "392ef35fd470638e08d0160d6b1cbab63cb23174", 2343 + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1afc39690e7414412face1f8cbf67b73db34485c",
  2344 + "reference": "1afc39690e7414412face1f8cbf67b73db34485c",
2217 "shasum": "" 2345 "shasum": ""
2218 }, 2346 },
2219 "require": { 2347 "require": {
@@ -2241,7 +2369,7 @@ @@ -2241,7 +2369,7 @@
2241 "type": "library", 2369 "type": "library",
2242 "extra": { 2370 "extra": {
2243 "branch-alias": { 2371 "branch-alias": {
2244 - "dev-master": "1.8.x-dev" 2372 + "dev-master": "1.9.x-dev"
2245 } 2373 }
2246 }, 2374 },
2247 "autoload": { 2375 "autoload": {
@@ -2268,7 +2396,7 @@ @@ -2268,7 +2396,7 @@
2268 "logging", 2396 "logging",
2269 "psr-3" 2397 "psr-3"
2270 ], 2398 ],
2271 - "time": "2014-03-23 19:50:26" 2399 + "time": "2014-04-20 16:41:26"
2272 }, 2400 },
2273 { 2401 {
2274 "name": "nikic/php-parser", 2402 "name": "nikic/php-parser",
@@ -2398,7 +2526,7 @@ @@ -2398,7 +2526,7 @@
2398 ], 2526 ],
2399 "authors": [ 2527 "authors": [
2400 { 2528 {
2401 - "name": "Johannes Schmitt", 2529 + "name": "Johannes M. Schmitt",
2402 "email": "schmittjoh@gmail.com", 2530 "email": "schmittjoh@gmail.com",
2403 "homepage": "http://jmsyst.com", 2531 "homepage": "http://jmsyst.com",
2404 "role": "Developer of wrapped JMSSerializerBundle" 2532 "role": "Developer of wrapped JMSSerializerBundle"
@@ -2418,13 +2546,13 @@ @@ -2418,13 +2546,13 @@
2418 "version": "1.0.0", 2546 "version": "1.0.0",
2419 "source": { 2547 "source": {
2420 "type": "git", 2548 "type": "git",
2421 - "url": "https://github.com/php-fig/log",  
2422 - "reference": "1.0.0" 2549 + "url": "https://github.com/php-fig/log.git",
  2550 + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
2423 }, 2551 },
2424 "dist": { 2552 "dist": {
2425 "type": "zip", 2553 "type": "zip",
2426 - "url": "https://github.com/php-fig/log/archive/1.0.0.zip",  
2427 - "reference": "1.0.0", 2554 + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
  2555 + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
2428 "shasum": "" 2556 "shasum": ""
2429 }, 2557 },
2430 "type": "library", 2558 "type": "library",
@@ -2487,7 +2615,9 @@ @@ -2487,7 +2615,9 @@
2487 "authors": [ 2615 "authors": [
2488 { 2616 {
2489 "name": "Fabien Potencier", 2617 "name": "Fabien Potencier",
2490 - "email": "fabien@symfony.com" 2618 + "email": "fabien@symfony.com",
  2619 + "homepage": "http://fabien.potencier.org",
  2620 + "role": "Lead Developer"
2491 } 2621 }
2492 ], 2622 ],
2493 "description": "The base bundle for the Symfony Distributions", 2623 "description": "The base bundle for the Symfony Distributions",
@@ -2534,7 +2664,9 @@ @@ -2534,7 +2664,9 @@
2534 "authors": [ 2664 "authors": [
2535 { 2665 {
2536 "name": "Fabien Potencier", 2666 "name": "Fabien Potencier",
2537 - "email": "fabien@symfony.com" 2667 + "email": "fabien@symfony.com",
  2668 + "homepage": "http://fabien.potencier.org",
  2669 + "role": "Lead Developer"
2538 } 2670 }
2539 ], 2671 ],
2540 "description": "This bundle provides a way to configure your controllers with annotations", 2672 "description": "This bundle provides a way to configure your controllers with annotations",
@@ -2586,7 +2718,9 @@ @@ -2586,7 +2718,9 @@
2586 "authors": [ 2718 "authors": [
2587 { 2719 {
2588 "name": "Fabien Potencier", 2720 "name": "Fabien Potencier",
2589 - "email": "fabien@symfony.com" 2721 + "email": "fabien@symfony.com",
  2722 + "homepage": "http://fabien.potencier.org",
  2723 + "role": "Lead Developer"
2590 } 2724 }
2591 ], 2725 ],
2592 "description": "This bundle generates code for you", 2726 "description": "This bundle generates code for you",
@@ -2650,27 +2784,27 @@ @@ -2650,27 +2784,27 @@
2650 "source": { 2784 "source": {
2651 "type": "git", 2785 "type": "git",
2652 "url": "https://github.com/symfony/AsseticBundle.git", 2786 "url": "https://github.com/symfony/AsseticBundle.git",
2653 - "reference": "v2.3.0" 2787 + "reference": "146dd3cb46b302bd471560471c6aaa930483dac1"
2654 }, 2788 },
2655 "dist": { 2789 "dist": {
2656 "type": "zip", 2790 "type": "zip",
2657 - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/v2.3.0",  
2658 - "reference": "v2.3.0", 2791 + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/146dd3cb46b302bd471560471c6aaa930483dac1",
  2792 + "reference": "146dd3cb46b302bd471560471c6aaa930483dac1",
2659 "shasum": "" 2793 "shasum": ""
2660 }, 2794 },
2661 "require": { 2795 "require": {
2662 - "kriswallsmith/assetic": ">=1.1,<2.0", 2796 + "kriswallsmith/assetic": "~1.1",
2663 "php": ">=5.3.0", 2797 "php": ">=5.3.0",
2664 - "symfony/framework-bundle": ">=2.1,<3.0" 2798 + "symfony/framework-bundle": "~2.1"
2665 }, 2799 },
2666 "require-dev": { 2800 "require-dev": {
2667 - "symfony/class-loader": ">=2.1,<3.0",  
2668 - "symfony/console": ">=2.1,<3.0",  
2669 - "symfony/css-selector": ">=2.1,<3.0",  
2670 - "symfony/dom-crawler": ">=2.1,<3.0",  
2671 - "symfony/form": ">=2.1,<3.0",  
2672 - "symfony/twig-bundle": ">=2.1,<3.0",  
2673 - "symfony/yaml": ">=2.1,<3.0" 2801 + "symfony/class-loader": "~2.1",
  2802 + "symfony/console": "~2.1",
  2803 + "symfony/css-selector": "~2.1",
  2804 + "symfony/dom-crawler": "~2.1",
  2805 + "symfony/form": "~2.1",
  2806 + "symfony/twig-bundle": "~2.1",
  2807 + "symfony/yaml": "~2.1"
2674 }, 2808 },
2675 "suggest": { 2809 "suggest": {
2676 "symfony/twig-bundle": "~2.1" 2810 "symfony/twig-bundle": "~2.1"
@@ -2813,23 +2947,23 @@ @@ -2813,23 +2947,23 @@
2813 "source": { 2947 "source": {
2814 "type": "git", 2948 "type": "git",
2815 "url": "https://github.com/symfony/MonologBundle.git", 2949 "url": "https://github.com/symfony/MonologBundle.git",
2816 - "reference": "v2.3.0" 2950 + "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a"
2817 }, 2951 },
2818 "dist": { 2952 "dist": {
2819 "type": "zip", 2953 "type": "zip",
2820 - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/v2.3.0",  
2821 - "reference": "v2.3.0", 2954 + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/03ed73bc11367b3156cc21f22ac37c7f70fcd10a",
  2955 + "reference": "03ed73bc11367b3156cc21f22ac37c7f70fcd10a",
2822 "shasum": "" 2956 "shasum": ""
2823 }, 2957 },
2824 "require": { 2958 "require": {
2825 - "monolog/monolog": ">=1.3,<2.0", 2959 + "monolog/monolog": "~1.3",
2826 "php": ">=5.3.2", 2960 "php": ">=5.3.2",
2827 - "symfony/config": ">=2.2-beta2,<3.0",  
2828 - "symfony/dependency-injection": ">=2.2-beta2,<3.0",  
2829 - "symfony/monolog-bridge": ">=2.2-beta2,<3.0" 2961 + "symfony/config": "~2.2-beta2",
  2962 + "symfony/dependency-injection": "~2.2-beta2",
  2963 + "symfony/monolog-bridge": "~2.2-beta2"
2830 }, 2964 },
2831 "require-dev": { 2965 "require-dev": {
2832 - "symfony/yaml": ">=2.2-beta2,<3.0" 2966 + "symfony/yaml": "~2.2-beta2"
2833 }, 2967 },
2834 "type": "symfony-bundle", 2968 "type": "symfony-bundle",
2835 "extra": { 2969 "extra": {
@@ -2849,7 +2983,9 @@ @@ -2849,7 +2983,9 @@
2849 "authors": [ 2983 "authors": [
2850 { 2984 {
2851 "name": "Fabien Potencier", 2985 "name": "Fabien Potencier",
2852 - "email": "fabien@symfony.com" 2986 + "email": "fabien@symfony.com",
  2987 + "homepage": "http://fabien.potencier.org",
  2988 + "role": "Lead Developer"
2853 }, 2989 },
2854 { 2990 {
2855 "name": "Symfony Community", 2991 "name": "Symfony Community",
@@ -3108,7 +3244,9 @@ @@ -3108,7 +3244,9 @@
3108 "authors": [ 3244 "authors": [
3109 { 3245 {
3110 "name": "Fabien Potencier", 3246 "name": "Fabien Potencier",
3111 - "email": "fabien@symfony.com" 3247 + "email": "fabien@symfony.com",
  3248 + "homepage": "http://fabien.potencier.org",
  3249 + "role": "Lead Developer"
3112 } 3250 }
3113 ], 3251 ],
3114 "description": "Common additional features for Twig that do not directly belong in core", 3252 "description": "Common additional features for Twig that do not directly belong in core",
@@ -3160,7 +3298,7 @@ @@ -3160,7 +3298,7 @@
3160 "role": "Lead Developer" 3298 "role": "Lead Developer"
3161 }, 3299 },
3162 { 3300 {
3163 - "name": "Armin Ronacher2", 3301 + "name": "Armin Ronacher",
3164 "email": "armin.ronacher@active-4.com", 3302 "email": "armin.ronacher@active-4.com",
3165 "role": "Project Founder" 3303 "role": "Project Founder"
3166 }, 3304 },
@@ -3287,7 +3425,9 @@ @@ -3287,7 +3425,9 @@
3287 "jms/serializer": 20, 3425 "jms/serializer": 20,
3288 "jms/serializer-bundle": 20, 3426 "jms/serializer-bundle": 20,
3289 "lightbase/cocar": 20, 3427 "lightbase/cocar": 20,
3290 - "ddeboer/data-import-bundle": 20 3428 + "ddeboer/data-import-bundle": 20,
  3429 + "doctrine/migrations": 20,
  3430 + "doctrine/doctrine-migrations-bundle": 20
3291 }, 3431 },
3292 "platform": { 3432 "platform": {
3293 "php": ">=5.3.3" 3433 "php": ">=5.3.3"
src/Cacic/CommonBundle/DoctrineMigrations/Version20140422230625.php 0 → 100644
  Diff comments   View file @4200361
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
  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 Version20140422230625 extends AbstractMigration implements ContainerAwareInterface
  14 +{
  15 +
  16 + private $container;
  17 +
  18 + public function setContainer(ContainerInterface $container = null)
  19 + {
  20 + $this->container = $container;
  21 + }
  22 +
  23 +
  24 + public function up(Schema $schema)
  25 + {
  26 + // this up() migration is auto-generated, please modify it to your needs
  27 + $this->abortIf($this->connection->getDatabasePlatform()->getName() != "postgresql", "Migration can only be executed safely on 'postgresql'.");
  28 +
  29 + $logger = $this->container->get('logger');
  30 + $rootDir = $this->container->get('kernel')->getRootDir();
  31 + $upgrade = $rootDir."/../src/Cacic/CommonBundle/Resources/data/upgrade-3.0b3.sql";
  32 + $upgradeSQL = file_get_contents($upgrade);
  33 +
  34 + $logger->debug("Arquivo de atualização: $upgrade");
  35 +
  36 + // Chama o container para executar o arquivo de atualização
  37 + // FIXME: Só funciona no PostgreSQL
  38 + $this->addSql($upgradeSQL);
  39 + $this->addSql("SELECT upgrade()");
  40 +
  41 + }
  42 +
  43 + public function down(Schema $schema)
  44 + {
  45 + // this down() migration is auto-generated, please modify it to your needs
  46 +
  47 + }
  48 +
  49 + public function postUp(Schema $schema)
  50 + {
  51 + $em = $this->container->get('doctrine.orm.entity_manager');
  52 + // ... update the entities
  53 + }
  54 +
  55 + public function postDown(Schema $schema)
  56 + {
  57 + $em = $this->container->get('doctrine.orm.entity_manager');
  58 + // ... update the entities
  59 + }
  60 +}
src/Cacic/CommonBundle/Resources/data/upgrade-3.0b3.sql 0 → 100644
  Diff comments   View file @4200361
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
  1 +CREATE OR REPLACE FUNCTION upgrade() RETURNS VOID AS $$
  2 + DECLARE
  3 +
  4 + soft record;
  5 + nm integer;
  6 + atualiza record;
  7 + comp integer;
  8 +
  9 + BEGIN
  10 +
  11 + FOR soft IN select sw.nm_software, count(distinct prop.id_software) as n_repeticoes
  12 + from software sw
  13 + inner join proriedade_software prop on sw.id_software = prop.id_software
  14 + group by sw.nm_software
  15 + having count(distinct prop.id_software) > 1
  16 + order by count(distinct prop.id_software) desc LOOP
  17 +
  18 + RAISE NOTICE 'O seguinte software possui entradas repetidas: %',soft.nm_software;
  19 +
  20 + -- Escolhe um software para colocar em todos
  21 + SELECT DISTINCT id_software INTO nm
  22 + FROM software
  23 + WHERE nm_software = soft.nm_software
  24 + ORDER BY id_software asc
  25 + LIMIT 1;
  26 +
  27 + -- Atualiza o valor de todas as entradas na tabela para o primeiro valor
  28 + FOR atualiza IN select distinct pr.id_propriedade_software
  29 + from software st
  30 + inner join proriedade_software pr on st.id_software = pr.id_software
  31 + where st.nm_software = soft.nm_software LOOP
  32 +
  33 +
  34 + RAISE NOTICE 'Atualizando o valor da propriedade = % com o software = %',atualiza.id_propriedade_software,nm;
  35 +
  36 + BEGIN
  37 +
  38 + UPDATE proriedade_software
  39 + SET id_software = nm
  40 + WHERE id_propriedade_software = atualiza.id_propriedade_software;
  41 +
  42 + EXCEPTION WHEN OTHERS THEN
  43 +
  44 + RAISE NOTICE 'ERRO!!!! Provavelmente a coleta estava repetida';
  45 +
  46 + END;
  47 +
  48 + END LOOP ;
  49 +
  50 + END LOOP;
  51 +
  52 + -- Finalmente limpa todos os softwares sem coleta
  53 +
  54 + FOR soft IN select distinct sw.id_software
  55 + from software sw
  56 + left join proriedade_software prop on sw.id_software = prop.id_software
  57 + left join aquisicao_item aq on sw.id_software = aq.id_software
  58 + where prop.id_software is null
  59 + and aq.id_software is null LOOP
  60 +
  61 + RAISE NOTICE 'Removendo software = %',soft.id_software;
  62 +
  63 + BEGIN
  64 +
  65 + DELETE FROM software
  66 + WHERE id_software = soft.id_software;
  67 +
  68 + EXCEPTION WHEN OTHERS THEN
  69 +
  70 + RAISE NOTICE 'Erro na exclusão do software %',soft.id_software;
  71 +
  72 + END ;
  73 +
  74 + END LOOP ;
  75 +
  76 +
  77 + RETURN;
  78 +
  79 + END;
  80 +
  81 +$$ LANGUAGE 'plpgsql';
0 \ No newline at end of file 82 \ No newline at end of file