Browse Source

upgrade symfony 2.2.4 and add monodb

Bastien Sevajol 11 years ago
parent
commit
adef175448
6 changed files with 260 additions and 47 deletions
  1. 1 0
      app/AppKernel.php
  2. 2 0
      app/autoload.php
  3. 3 3
      app/bootstrap.php.cache
  4. 10 2
      composer.json
  5. 244 42
      composer.lock
  6. BIN
      composer.phar

+ 1 - 0
app/AppKernel.php View File

@@ -33,6 +33,7 @@ class AppKernel extends Kernel
33 33
             new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
34 34
             new Shtumi\UsefulBundle\ShtumiUsefulBundle(),
35 35
             new FOS\FacebookBundle\FOSFacebookBundle(),
36
+            new Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle(),
36 37
             
37 38
             new Muzich\CoreBundle\MuzichCoreBundle(),
38 39
             new Muzich\UserBundle\MuzichUserBundle(),

+ 2 - 0
app/autoload.php View File

@@ -1,6 +1,7 @@
1 1
 <?php
2 2
 
3 3
 use Doctrine\Common\Annotations\AnnotationRegistry;
4
+use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
4 5
 
5 6
 $loader = include __DIR__.'/../vendor/autoload.php';
6 7
 
@@ -12,5 +13,6 @@ if (!function_exists('intl_get_error_code')) {
12 13
 }
13 14
 
14 15
 AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
16
+AnnotationDriver::registerAnnotationClasses();
15 17
 
16 18
 return $loader;

+ 3 - 3
app/bootstrap.php.cache View File

@@ -327,11 +327,11 @@ protected $name;
327 327
 protected $startTime;
328 328
 protected $classes;
329 329
 protected $errorReportingLevel;
330
-const VERSION ='2.2.3';
331
-const VERSION_ID ='20203';
330
+const VERSION ='2.2.4';
331
+const VERSION_ID ='20204';
332 332
 const MAJOR_VERSION ='2';
333 333
 const MINOR_VERSION ='2';
334
-const RELEASE_VERSION ='3';
334
+const RELEASE_VERSION ='4';
335 335
 const EXTRA_VERSION ='';
336 336
 public function __construct($environment, $debug)
337 337
 {

+ 10 - 2
composer.json View File

@@ -7,7 +7,7 @@
7 7
     },
8 8
     "require": {
9 9
         "php": ">=5.3.3",
10
-        "symfony/symfony": "v2.2.3",
10
+        "symfony/symfony": "v2.2.4",
11 11
         "doctrine/orm": "2.3.4",
12 12
         "doctrine/doctrine-bundle": "v1.2.0",
13 13
         "twig/extensions": "1.0.*@dev",
@@ -35,7 +35,15 @@
35 35
         "sonata-project/admin-bundle": "2.2.2",
36 36
         "sonata-project/jquery-bundle": "1.8.*@dev",
37 37
         "sonata-project/block-bundle": "2.2.3",
38
-        "friendsofsymfony/facebook-bundle": "dev-master"
38
+        "friendsofsymfony/facebook-bundle": "dev-master",
39
+        
40
+        "doctrine/mongodb-odm-bundle": "v3.0.0-BETA4",
41
+        "doctrine/mongodb-odm": "1.0.0-BETA9",
42
+        "symfony/options-resolver": "v2.2.4",
43
+        "symfony/doctrine-bridge": "v2.2.4",
44
+        "doctrine/mongodb": "1.0.0-BETA1"
45
+        
46
+        
39 47
     },
40 48
     "scripts": {
41 49
         "post-install-cmd": [

+ 244 - 42
composer.lock View File

@@ -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": "0a6ed902bb57e0f8c4f106273cf613f0",
6
+    "hash": "66af7e69e293a353ab3fb2c45f07a831",
7 7
     "packages": [
8 8
         {
9 9
             "name": "cedriclombardot/admingenerator-generator-bundle",
@@ -191,12 +191,12 @@
191 191
             "source": {
192 192
                 "type": "git",
193 193
                 "url": "https://github.com/doctrine/data-fixtures.git",
194
-                "reference": "6924952026b77ff492da559b04ad166d25c611cb"
194
+                "reference": "b4a135c7db56ecc4602b54a2184368f440cac33e"
195 195
             },
196 196
             "dist": {
197 197
                 "type": "zip",
198
-                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/6924952026b77ff492da559b04ad166d25c611cb",
199
-                "reference": "6924952026b77ff492da559b04ad166d25c611cb",
198
+                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/b4a135c7db56ecc4602b54a2184368f440cac33e",
199
+                "reference": "b4a135c7db56ecc4602b54a2184368f440cac33e",
200 200
                 "shasum": ""
201 201
             },
202 202
             "require": {
@@ -238,7 +238,7 @@
238 238
             "keywords": [
239 239
                 "database"
240 240
             ],
241
-            "time": "2013-04-11 23:14:04"
241
+            "time": "2013-07-10 17:04:07"
242 242
         },
243 243
         {
244 244
             "name": "doctrine/dbal",
@@ -380,12 +380,12 @@
380 380
             "source": {
381 381
                 "type": "git",
382 382
                 "url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
383
-                "reference": "512fc0fa1d0ce7bdcc6a0a91812eb531f20e0828"
383
+                "reference": "8070624b47f7f171db4c9e4134436db7de51244c"
384 384
             },
385 385
             "dist": {
386 386
                 "type": "zip",
387
-                "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/512fc0fa1d0ce7bdcc6a0a91812eb531f20e0828",
388
-                "reference": "512fc0fa1d0ce7bdcc6a0a91812eb531f20e0828",
387
+                "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/8070624b47f7f171db4c9e4134436db7de51244c",
388
+                "reference": "8070624b47f7f171db4c9e4134436db7de51244c",
389 389
                 "shasum": ""
390 390
             },
391 391
             "require": {
@@ -429,7 +429,206 @@
429 429
                 "Fixture",
430 430
                 "persistence"
431 431
             ],
432
-            "time": "2013-06-21 10:31:45"
432
+            "time": "2013-07-18 09:26:47"
433
+        },
434
+        {
435
+            "name": "doctrine/mongodb",
436
+            "version": "1.0.0-BETA1",
437
+            "source": {
438
+                "type": "git",
439
+                "url": "https://github.com/doctrine/mongodb.git",
440
+                "reference": "1.0.0-BETA1"
441
+            },
442
+            "dist": {
443
+                "type": "zip",
444
+                "url": "https://api.github.com/repos/doctrine/mongodb/zipball/1.0.0-BETA1",
445
+                "reference": "1.0.0-BETA1",
446
+                "shasum": ""
447
+            },
448
+            "require": {
449
+                "doctrine/common": ">=2.1.0",
450
+                "ext-mongo": "*",
451
+                "php": ">=5.3.2",
452
+                "symfony/console": ">=2.0",
453
+                "symfony/yaml": ">=2.0"
454
+            },
455
+            "type": "library",
456
+            "autoload": {
457
+                "psr-0": {
458
+                    "Doctrine\\MongoDB": "lib/"
459
+                }
460
+            },
461
+            "notification-url": "https://packagist.org/downloads/",
462
+            "license": [
463
+                "MIT"
464
+            ],
465
+            "authors": [
466
+                {
467
+                    "name": "Bulat Shakirzyanov",
468
+                    "email": "mallluhuct@gmail.com",
469
+                    "homepage": "http://avalanche123.com"
470
+                },
471
+                {
472
+                    "name": "Jonathan H. Wage",
473
+                    "email": "jonwage@gmail.com",
474
+                    "homepage": "http://www.jwage.com/"
475
+                },
476
+                {
477
+                    "name": "Kris Wallsmith",
478
+                    "email": "kris.wallsmith@gmail.com",
479
+                    "homepage": "http://kriswallsmith.net/"
480
+                }
481
+            ],
482
+            "description": "Doctrine MongoDB Abstraction Layer",
483
+            "homepage": "http://www.doctrine-project.org",
484
+            "keywords": [
485
+                "mongodb",
486
+                "persistence"
487
+            ],
488
+            "time": "2012-08-02 18:00:59"
489
+        },
490
+        {
491
+            "name": "doctrine/mongodb-odm",
492
+            "version": "1.0.0-BETA9",
493
+            "source": {
494
+                "type": "git",
495
+                "url": "https://github.com/doctrine/mongodb-odm.git",
496
+                "reference": "1.0.0-BETA9"
497
+            },
498
+            "dist": {
499
+                "type": "zip",
500
+                "url": "https://api.github.com/repos/doctrine/mongodb-odm/zipball/1.0.0-BETA9",
501
+                "reference": "1.0.0-BETA9",
502
+                "shasum": ""
503
+            },
504
+            "require": {
505
+                "doctrine/common": ">=2.2.0,<2.5-dev",
506
+                "doctrine/mongodb": "1.0.*",
507
+                "php": ">=5.3.2",
508
+                "symfony/console": ">=2.0,<3.0"
509
+            },
510
+            "require-dev": {
511
+                "symfony/yaml": ">=2.0,<3.0"
512
+            },
513
+            "suggest": {
514
+                "symfony/yaml": "Enables the YAML metadata mapping driver"
515
+            },
516
+            "type": "library",
517
+            "extra": {
518
+                "branch-alias": {
519
+                    "dev-master": "1.0.x-dev"
520
+                }
521
+            },
522
+            "autoload": {
523
+                "psr-0": {
524
+                    "Doctrine\\ODM\\MongoDB": "lib/"
525
+                }
526
+            },
527
+            "notification-url": "https://packagist.org/downloads/",
528
+            "license": [
529
+                "MIT"
530
+            ],
531
+            "authors": [
532
+                {
533
+                    "name": "Bulat Shakirzyanov",
534
+                    "email": "mallluhuct@gmail.com",
535
+                    "homepage": "http://avalanche123.com"
536
+                },
537
+                {
538
+                    "name": "Jonathan H. Wage",
539
+                    "email": "jonwage@gmail.com",
540
+                    "homepage": "http://www.jwage.com/"
541
+                },
542
+                {
543
+                    "name": "Kris Wallsmith",
544
+                    "email": "kris.wallsmith@gmail.com",
545
+                    "homepage": "http://kriswallsmith.net/"
546
+                },
547
+                {
548
+                    "name": "Jeremy Mikola",
549
+                    "email": "jmikola@gmail.com",
550
+                    "homepage": "http://jmikola.net"
551
+                }
552
+            ],
553
+            "description": "Doctrine MongoDB Object Document Mapper",
554
+            "homepage": "http://www.doctrine-project.org",
555
+            "keywords": [
556
+                "database",
557
+                "mongodb",
558
+                "odm",
559
+                "persistence"
560
+            ],
561
+            "time": "2013-06-06 19:15:45"
562
+        },
563
+        {
564
+            "name": "doctrine/mongodb-odm-bundle",
565
+            "version": "v3.0.0-BETA4",
566
+            "target-dir": "Doctrine/Bundle/MongoDBBundle",
567
+            "source": {
568
+                "type": "git",
569
+                "url": "https://github.com/doctrine/DoctrineMongoDBBundle.git",
570
+                "reference": "v3.0.0-BETA4"
571
+            },
572
+            "dist": {
573
+                "type": "zip",
574
+                "url": "https://api.github.com/repos/doctrine/DoctrineMongoDBBundle/zipball/v3.0.0-BETA4",
575
+                "reference": "v3.0.0-BETA4",
576
+                "shasum": ""
577
+            },
578
+            "require": {
579
+                "doctrine/mongodb-odm": ">=1.0-beta5,<1.1",
580
+                "php": ">=5.3.2",
581
+                "symfony/doctrine-bridge": ">=2.1,<2.3-dev",
582
+                "symfony/framework-bundle": ">=2.1,<2.3-dev",
583
+                "symfony/options-resolver": ">=2.1,<2.3-dev"
584
+            },
585
+            "require-dev": {
586
+                "doctrine/data-fixtures": "@dev",
587
+                "symfony/form": ">=2.1,<2.3-dev",
588
+                "symfony/yaml": ">=2.1,<2.3-dev"
589
+            },
590
+            "suggest": {
591
+                "doctrine/data-fixtures": "Load data fixtures"
592
+            },
593
+            "type": "symfony-bundle",
594
+            "extra": {
595
+                "branch-alias": {
596
+                    "dev-master": "3.0-dev"
597
+                }
598
+            },
599
+            "autoload": {
600
+                "psr-0": {
601
+                    "Doctrine\\Bundle\\MongoDBBundle": ""
602
+                }
603
+            },
604
+            "notification-url": "https://packagist.org/downloads/",
605
+            "license": [
606
+                "MIT"
607
+            ],
608
+            "authors": [
609
+                {
610
+                    "name": "Bulat Shakirzyanov",
611
+                    "email": "mallluhuct@gmail.com",
612
+                    "homepage": "http://avalanche123.com"
613
+                },
614
+                {
615
+                    "name": "Jonathan H. Wage",
616
+                    "email": "jonwage@gmail.com",
617
+                    "homepage": "http://www.jwage.com/"
618
+                },
619
+                {
620
+                    "name": "Kris Wallsmith",
621
+                    "email": "kris@symfony.com"
622
+                }
623
+            ],
624
+            "description": "Symfony2 Doctrine MongoDB Bundle",
625
+            "homepage": "http://www.doctrine-project.org",
626
+            "keywords": [
627
+                "mongodb",
628
+                "persistence",
629
+                "symfony"
630
+            ],
631
+            "time": "2013-03-18 18:12:08"
433 632
         },
434 633
         {
435 634
             "name": "doctrine/orm",
@@ -756,12 +955,12 @@
756 955
             "source": {
757 956
                 "type": "git",
758 957
                 "url": "https://github.com/Gregwar/ImageBundle.git",
759
-                "reference": "ae746b296768cc63c7f3478446dc5bf5d36812d4"
958
+                "reference": "c0f86ad2095e084bb899d22304581d14c02d3da6"
760 959
             },
761 960
             "dist": {
762 961
                 "type": "zip",
763
-                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/ae746b296768cc63c7f3478446dc5bf5d36812d4",
764
-                "reference": "ae746b296768cc63c7f3478446dc5bf5d36812d4",
962
+                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/c0f86ad2095e084bb899d22304581d14c02d3da6",
963
+                "reference": "c0f86ad2095e084bb899d22304581d14c02d3da6",
765 964
                 "shasum": ""
766 965
             },
767 966
             "require": {
@@ -791,7 +990,7 @@
791 990
                 "Symfony2",
792 991
                 "image"
793 992
             ],
794
-            "time": "2013-06-02 20:38:56"
993
+            "time": "2013-07-23 15:16:28"
795 994
         },
796 995
         {
797 996
             "name": "jdorn/sql-formatter",
@@ -983,7 +1182,7 @@
983 1182
                 {
984 1183
                     "name": "Johannes M. Schmitt",
985 1184
                     "email": "schmittjoh@gmail.com",
986
-                    "homepage": "https://github.com/schmittjoh",
1185
+                    "homepage": "http://jmsyst.com",
987 1186
                     "role": "Developer of wrapped JMSSerializerBundle"
988 1187
                 }
989 1188
             ],
@@ -1034,7 +1233,7 @@
1034 1233
                 {
1035 1234
                     "name": "Johannes M. Schmitt",
1036 1235
                     "email": "schmittjoh@gmail.com",
1037
-                    "homepage": "https://github.com/schmittjoh",
1236
+                    "homepage": "http://jmsyst.com",
1038 1237
                     "role": "Developer of wrapped JMSSerializerBundle"
1039 1238
                 }
1040 1239
             ],
@@ -1138,7 +1337,7 @@
1138 1337
                 {
1139 1338
                     "name": "Johannes M. Schmitt",
1140 1339
                     "email": "schmittjoh@gmail.com",
1141
-                    "homepage": "https://github.com/schmittjoh",
1340
+                    "homepage": "http://jmsyst.com",
1142 1341
                     "role": "Developer of wrapped JMSSerializerBundle"
1143 1342
                 }
1144 1343
             ],
@@ -1339,26 +1538,26 @@
1339 1538
         },
1340 1539
         {
1341 1540
             "name": "monolog/monolog",
1342
-            "version": "1.5.0",
1541
+            "version": "1.6.0",
1343 1542
             "source": {
1344 1543
                 "type": "git",
1345 1544
                 "url": "https://github.com/Seldaek/monolog.git",
1346
-                "reference": "1.5.0"
1545
+                "reference": "1.6.0"
1347 1546
             },
1348 1547
             "dist": {
1349 1548
                 "type": "zip",
1350
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.5.0",
1351
-                "reference": "1.5.0",
1549
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1.6.0",
1550
+                "reference": "1.6.0",
1352 1551
                 "shasum": ""
1353 1552
             },
1354 1553
             "require": {
1355 1554
                 "php": ">=5.3.0",
1356
-                "psr/log": ">=1.0,<2.0"
1555
+                "psr/log": "~1.0"
1357 1556
             },
1358 1557
             "require-dev": {
1359 1558
                 "doctrine/couchdb": "dev-master",
1360 1559
                 "mlehner/gelf-php": "1.0.*",
1361
-                "raven/raven": "0.3.*"
1560
+                "raven/raven": "0.5.*"
1362 1561
             },
1363 1562
             "suggest": {
1364 1563
                 "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
@@ -1370,7 +1569,7 @@
1370 1569
             "type": "library",
1371 1570
             "extra": {
1372 1571
                 "branch-alias": {
1373
-                    "dev-master": "1.4.x-dev"
1572
+                    "dev-master": "1.6.x-dev"
1374 1573
                 }
1375 1574
             },
1376 1575
             "autoload": {
@@ -1397,7 +1596,7 @@
1397 1596
                 "logging",
1398 1597
                 "psr-3"
1399 1598
             ],
1400
-            "time": "2013-04-23 10:09:48"
1599
+            "time": "2013-07-28 22:38:30"
1401 1600
         },
1402 1601
         {
1403 1602
             "name": "pagerfanta/pagerfanta",
@@ -1420,7 +1619,7 @@
1420 1619
                 "doctrine/mongodb-odm": "*",
1421 1620
                 "doctrine/orm": "2.*",
1422 1621
                 "mandango/mandango": "*",
1423
-                "propel/propel1": ">=1.6,<2.0",
1622
+                "propel/propel1": "~1.6",
1424 1623
                 "solarium/solarium": "dev-develop"
1425 1624
             },
1426 1625
             "suggest": {
@@ -1696,12 +1895,12 @@
1696 1895
             "source": {
1697 1896
                 "type": "git",
1698 1897
                 "url": "https://github.com/shtumi/ShtumiUsefulBundle.git",
1699
-                "reference": "fc6cef6a071d903749dfcff38884f9c240f9e6cf"
1898
+                "reference": "c48ef1a7c1ff8c2b9db73f9c1a69f63e1f6bcbef"
1700 1899
             },
1701 1900
             "dist": {
1702 1901
                 "type": "zip",
1703
-                "url": "https://api.github.com/repos/shtumi/ShtumiUsefulBundle/zipball/fc6cef6a071d903749dfcff38884f9c240f9e6cf",
1704
-                "reference": "fc6cef6a071d903749dfcff38884f9c240f9e6cf",
1902
+                "url": "https://api.github.com/repos/shtumi/ShtumiUsefulBundle/zipball/c48ef1a7c1ff8c2b9db73f9c1a69f63e1f6bcbef",
1903
+                "reference": "c48ef1a7c1ff8c2b9db73f9c1a69f63e1f6bcbef",
1705 1904
                 "shasum": ""
1706 1905
             },
1707 1906
             "require": {
@@ -1734,7 +1933,7 @@
1734 1933
                 "daterange",
1735 1934
                 "shtumi"
1736 1935
             ],
1737
-            "time": "2013-04-08 08:10:20"
1936
+            "time": "2013-07-20 18:33:09"
1738 1937
         },
1739 1938
         {
1740 1939
             "name": "sonata-project/admin-bundle",
@@ -2324,23 +2523,23 @@
2324 2523
         },
2325 2524
         {
2326 2525
             "name": "symfony/symfony",
2327
-            "version": "v2.2.3",
2526
+            "version": "v2.2.4",
2328 2527
             "source": {
2329 2528
                 "type": "git",
2330 2529
                 "url": "https://github.com/symfony/symfony.git",
2331
-                "reference": "v2.2.3"
2530
+                "reference": "v2.2.4"
2332 2531
             },
2333 2532
             "dist": {
2334 2533
                 "type": "zip",
2335
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/v2.2.3",
2336
-                "reference": "v2.2.3",
2534
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/v2.2.4",
2535
+                "reference": "v2.2.4",
2337 2536
                 "shasum": ""
2338 2537
             },
2339 2538
             "require": {
2340
-                "doctrine/common": ">=2.2,<3.0",
2539
+                "doctrine/common": "~2.2",
2341 2540
                 "php": ">=5.3.3",
2342
-                "psr/log": ">=1.0,<2.0",
2343
-                "twig/twig": ">=1.11.0,<2.0"
2541
+                "psr/log": "~1.0",
2542
+                "twig/twig": "~1.11"
2344 2543
             },
2345 2544
             "replace": {
2346 2545
                 "symfony/browser-kit": "self.version",
@@ -2380,9 +2579,9 @@
2380 2579
             },
2381 2580
             "require-dev": {
2382 2581
                 "doctrine/data-fixtures": "1.0.*",
2383
-                "doctrine/dbal": ">=2.2,<3.0",
2384
-                "doctrine/orm": ">=2.2,<3.0,>=2.2.3",
2385
-                "monolog/monolog": ">=1.3,<2.0",
2582
+                "doctrine/dbal": "~2.2",
2583
+                "doctrine/orm": "~2.2,>=2.2.3",
2584
+                "monolog/monolog": "~1.3",
2386 2585
                 "propel/propel1": "1.6.*"
2387 2586
             },
2388 2587
             "type": "library",
@@ -2419,7 +2618,7 @@
2419 2618
             "keywords": [
2420 2619
                 "framework"
2421 2620
             ],
2422
-            "time": "2013-06-19 12:09:49"
2621
+            "time": "2013-07-15 12:28:01"
2423 2622
         },
2424 2623
         {
2425 2624
             "name": "twig/extensions",
@@ -2534,7 +2733,7 @@
2534 2733
             },
2535 2734
             "require": {
2536 2735
                 "pagerfanta/pagerfanta": "1.0.*",
2537
-                "symfony/framework-bundle": ">=2.1,<3.0"
2736
+                "symfony/framework-bundle": "~2.1"
2538 2737
             },
2539 2738
             "type": "symfony-bundle",
2540 2739
             "extra": {
@@ -2585,7 +2784,10 @@
2585 2784
         "pagerfanta/pagerfanta": 20,
2586 2785
         "shtumi/useful-bundle": 20,
2587 2786
         "sonata-project/jquery-bundle": 20,
2588
-        "friendsofsymfony/facebook-bundle": 20
2787
+        "friendsofsymfony/facebook-bundle": 20,
2788
+        "doctrine/mongodb-odm-bundle": 10,
2789
+        "doctrine/mongodb-odm": 10,
2790
+        "doctrine/mongodb": 10
2589 2791
     },
2590 2792
     "platform": {
2591 2793
         "php": ">=5.3.3"

BIN
composer.phar View File