aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml6
-rw-r--r--composer.json3
-rw-r--r--composer.lock169
4 files changed, 156 insertions, 23 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 93b0201a..d2aa8d1c 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -32,6 +32,7 @@ class AppKernel extends Kernel
32 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), 32 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(), 33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
34 new Wallabag\ImportBundle\WallabagImportBundle(), 34 new Wallabag\ImportBundle\WallabagImportBundle(),
35 new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
35 ); 36 );
36 37
37 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 38 if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/config.yml b/app/config/config.yml
index e50f9b52..8e9369c2 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -102,6 +102,12 @@ stof_doctrine_extensions:
102 tree: true 102 tree: true
103 sluggable: true 103 sluggable: true
104 104
105doctrine_migrations:
106 dir_name: "%kernel.root_dir%/DoctrineMigrations"
107 namespace: Application\Migrations
108 table_name: migration_versions
109 name: Application Migrations
110
105# Swiftmailer Configuration 111# Swiftmailer Configuration
106swiftmailer: 112swiftmailer:
107 transport: "%mailer_transport%" 113 transport: "%mailer_transport%"
diff --git a/composer.json b/composer.json
index 0ba42a3e..3300c0fb 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,8 @@
60 "grandt/phpepub": "~4.0", 60 "grandt/phpepub": "~4.0",
61 "wallabag/php-mobi": "~1.0.0", 61 "wallabag/php-mobi": "~1.0.0",
62 "kphoen/rulerz-bundle": "~0.10", 62 "kphoen/rulerz-bundle": "~0.10",
63 "guzzlehttp/guzzle": "^5.2.0" 63 "guzzlehttp/guzzle": "^5.2.0",
64 "doctrine/doctrine-migrations-bundle": "^1.0"
64 }, 65 },
65 "require-dev": { 66 "require-dev": {
66 "doctrine/doctrine-fixtures-bundle": "~2.2.0", 67 "doctrine/doctrine-fixtures-bundle": "~2.2.0",
diff --git a/composer.lock b/composer.lock
index 858a125c..f47e8574 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "fdba142656b2089b0e4cbddb45e2ad1f", 7 "hash": "e738598a939db93e1c63d4aca980e42b",
8 "content-hash": "a233f851c52683783b6a42be707c52b1", 8 "content-hash": "19dffb1d7e701242746aea4ca17cebc2",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "behat/transliterator", 11 "name": "behat/transliterator",
@@ -326,16 +326,16 @@
326 }, 326 },
327 { 327 {
328 "name": "doctrine/dbal", 328 "name": "doctrine/dbal",
329 "version": "v2.5.3", 329 "version": "v2.5.4",
330 "source": { 330 "source": {
331 "type": "git", 331 "type": "git",
332 "url": "https://github.com/doctrine/dbal.git", 332 "url": "https://github.com/doctrine/dbal.git",
333 "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648" 333 "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
334 }, 334 },
335 "dist": { 335 "dist": {
336 "type": "zip", 336 "type": "zip",
337 "url": "https://api.github.com/repos/doctrine/dbal/zipball/2fbcea96eae34a53183377cdbb0b9bec33974648", 337 "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
338 "reference": "2fbcea96eae34a53183377cdbb0b9bec33974648", 338 "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
339 "shasum": "" 339 "shasum": ""
340 }, 340 },
341 "require": { 341 "require": {
@@ -393,7 +393,7 @@
393 "persistence", 393 "persistence",
394 "queryobject" 394 "queryobject"
395 ], 395 ],
396 "time": "2015-12-25 16:28:24" 396 "time": "2016-01-05 22:11:12"
397 }, 397 },
398 { 398 {
399 "name": "doctrine/doctrine-bundle", 399 "name": "doctrine/doctrine-bundle",
@@ -561,6 +561,64 @@
561 "time": "2015-11-27 04:59:07" 561 "time": "2015-11-27 04:59:07"
562 }, 562 },
563 { 563 {
564 "name": "doctrine/doctrine-migrations-bundle",
565 "version": "1.1.1",
566 "source": {
567 "type": "git",
568 "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
569 "reference": "303a576e2124efb07ec215e34ea2480b841cf5e4"
570 },
571 "dist": {
572 "type": "zip",
573 "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/303a576e2124efb07ec215e34ea2480b841cf5e4",
574 "reference": "303a576e2124efb07ec215e34ea2480b841cf5e4",
575 "shasum": ""
576 },
577 "require": {
578 "doctrine/doctrine-bundle": "~1.0",
579 "doctrine/migrations": "~1.0",
580 "php": ">=5.3.2",
581 "symfony/framework-bundle": "~2.3|~3.0"
582 },
583 "type": "symfony-bundle",
584 "extra": {
585 "branch-alias": {
586 "dev-master": "1.1-dev"
587 }
588 },
589 "autoload": {
590 "psr-4": {
591 "Doctrine\\Bundle\\MigrationsBundle\\": ""
592 }
593 },
594 "notification-url": "https://packagist.org/downloads/",
595 "license": [
596 "MIT"
597 ],
598 "authors": [
599 {
600 "name": "Symfony Community",
601 "homepage": "http://symfony.com/contributors"
602 },
603 {
604 "name": "Doctrine Project",
605 "homepage": "http://www.doctrine-project.org"
606 },
607 {
608 "name": "Fabien Potencier",
609 "email": "fabien@symfony.com"
610 }
611 ],
612 "description": "Symfony DoctrineMigrationsBundle",
613 "homepage": "http://www.doctrine-project.org",
614 "keywords": [
615 "dbal",
616 "migrations",
617 "schema"
618 ],
619 "time": "2015-11-04 13:45:30"
620 },
621 {
564 "name": "doctrine/inflector", 622 "name": "doctrine/inflector",
565 "version": "v1.1.0", 623 "version": "v1.1.0",
566 "source": { 624 "source": {
@@ -736,17 +794,85 @@
736 "time": "2014-09-09 13:34:57" 794 "time": "2014-09-09 13:34:57"
737 }, 795 },
738 { 796 {
797 "name": "doctrine/migrations",
798 "version": "v1.2.2",
799 "source": {
800 "type": "git",
801 "url": "https://github.com/doctrine/migrations.git",
802 "reference": "6b70c2c4484c02878743929bb3cd3fdbf41193a6"
803 },
804 "dist": {
805 "type": "zip",
806 "url": "https://api.github.com/repos/doctrine/migrations/zipball/6b70c2c4484c02878743929bb3cd3fdbf41193a6",
807 "reference": "6b70c2c4484c02878743929bb3cd3fdbf41193a6",
808 "shasum": ""
809 },
810 "require": {
811 "doctrine/dbal": "~2.2",
812 "php": ">=5.4.0",
813 "symfony/console": "~2.3|~3.0",
814 "symfony/yaml": "~2.3|~3.0"
815 },
816 "require-dev": {
817 "doctrine/coding-standard": "dev-master",
818 "doctrine/orm": "2.*",
819 "johnkary/phpunit-speedtrap": "~1.0@dev",
820 "mockery/mockery": "^0.9.4",
821 "phpunit/phpunit": "~4.7",
822 "satooshi/php-coveralls": "0.6.*"
823 },
824 "bin": [
825 "bin/doctrine-migrations"
826 ],
827 "type": "library",
828 "extra": {
829 "branch-alias": {
830 "dev-master": "v1.1.x-dev"
831 }
832 },
833 "autoload": {
834 "psr-4": {
835 "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations"
836 }
837 },
838 "notification-url": "https://packagist.org/downloads/",
839 "license": [
840 "LGPL-2.1"
841 ],
842 "authors": [
843 {
844 "name": "Benjamin Eberlei",
845 "email": "kontakt@beberlei.de"
846 },
847 {
848 "name": "Jonathan Wage",
849 "email": "jonwage@gmail.com"
850 },
851 {
852 "name": "Michael Simonson",
853 "email": "contact@mikesimonson.com"
854 }
855 ],
856 "description": "Database Schema migrations using Doctrine DBAL",
857 "homepage": "http://www.doctrine-project.org",
858 "keywords": [
859 "database",
860 "migrations"
861 ],
862 "time": "2016-01-07 21:28:50"
863 },
864 {
739 "name": "doctrine/orm", 865 "name": "doctrine/orm",
740 "version": "v2.5.3", 866 "version": "v2.5.4",
741 "source": { 867 "source": {
742 "type": "git", 868 "type": "git",
743 "url": "https://github.com/doctrine/doctrine2.git", 869 "url": "https://github.com/doctrine/doctrine2.git",
744 "reference": "d9fc5388f1aa1751a0e148e76b4569bd207338e9" 870 "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab"
745 }, 871 },
746 "dist": { 872 "dist": {
747 "type": "zip", 873 "type": "zip",
748 "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/d9fc5388f1aa1751a0e148e76b4569bd207338e9", 874 "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
749 "reference": "d9fc5388f1aa1751a0e148e76b4569bd207338e9", 875 "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
750 "shasum": "" 876 "shasum": ""
751 }, 877 },
752 "require": { 878 "require": {
@@ -761,7 +887,6 @@
761 }, 887 },
762 "require-dev": { 888 "require-dev": {
763 "phpunit/phpunit": "~4.0", 889 "phpunit/phpunit": "~4.0",
764 "satooshi/php-coveralls": "dev-master",
765 "symfony/yaml": "~2.3|~3.0" 890 "symfony/yaml": "~2.3|~3.0"
766 }, 891 },
767 "suggest": { 892 "suggest": {
@@ -810,7 +935,7 @@
810 "database", 935 "database",
811 "orm" 936 "orm"
812 ], 937 ],
813 "time": "2015-12-25 15:50:05" 938 "time": "2016-01-05 21:34:58"
814 }, 939 },
815 { 940 {
816 "name": "ezyang/htmlpurifier", 941 "name": "ezyang/htmlpurifier",
@@ -1071,12 +1196,12 @@
1071 "source": { 1196 "source": {
1072 "type": "git", 1197 "type": "git",
1073 "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", 1198 "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
1074 "reference": "e5e7a2b8984da8dfedaf44adc7e5f60a62ad280c" 1199 "reference": "6ccff96434c0ac7fee077d1dce90966341dfd278"
1075 }, 1200 },
1076 "dist": { 1201 "dist": {
1077 "type": "zip", 1202 "type": "zip",
1078 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/e5e7a2b8984da8dfedaf44adc7e5f60a62ad280c", 1203 "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/6ccff96434c0ac7fee077d1dce90966341dfd278",
1079 "reference": "e5e7a2b8984da8dfedaf44adc7e5f60a62ad280c", 1204 "reference": "6ccff96434c0ac7fee077d1dce90966341dfd278",
1080 "shasum": "" 1205 "shasum": ""
1081 }, 1206 },
1082 "require": { 1207 "require": {
@@ -1132,7 +1257,7 @@
1132 "keywords": [ 1257 "keywords": [
1133 "User management" 1258 "User management"
1134 ], 1259 ],
1135 "time": "2015-12-28 18:02:43" 1260 "time": "2016-01-08 10:46:39"
1136 }, 1261 },
1137 { 1262 {
1138 "name": "gedmo/doctrine-extensions", 1263 "name": "gedmo/doctrine-extensions",
@@ -3314,17 +3439,17 @@
3314 }, 3439 },
3315 { 3440 {
3316 "name": "nelmio/api-doc-bundle", 3441 "name": "nelmio/api-doc-bundle",
3317 "version": "2.11.1", 3442 "version": "2.11.2",
3318 "target-dir": "Nelmio/ApiDocBundle", 3443 "target-dir": "Nelmio/ApiDocBundle",
3319 "source": { 3444 "source": {
3320 "type": "git", 3445 "type": "git",
3321 "url": "https://github.com/nelmio/NelmioApiDocBundle.git", 3446 "url": "https://github.com/nelmio/NelmioApiDocBundle.git",
3322 "reference": "19d4e37365edd5104e31662a2d3b510d92a7e78a" 3447 "reference": "1ae2cfa9a50279d722d6b6e7b02322cef948d55d"
3323 }, 3448 },
3324 "dist": { 3449 "dist": {
3325 "type": "zip", 3450 "type": "zip",
3326 "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/19d4e37365edd5104e31662a2d3b510d92a7e78a", 3451 "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/1ae2cfa9a50279d722d6b6e7b02322cef948d55d",
3327 "reference": "19d4e37365edd5104e31662a2d3b510d92a7e78a", 3452 "reference": "1ae2cfa9a50279d722d6b6e7b02322cef948d55d",
3328 "shasum": "" 3453 "shasum": ""
3329 }, 3454 },
3330 "require": { 3455 "require": {
@@ -3394,7 +3519,7 @@
3394 "documentation", 3519 "documentation",
3395 "rest" 3520 "rest"
3396 ], 3521 ],
3397 "time": "2015-12-08 13:19:42" 3522 "time": "2015-12-16 15:17:51"
3398 }, 3523 },
3399 { 3524 {
3400 "name": "nelmio/cors-bundle", 3525 "name": "nelmio/cors-bundle",