Browse Source

Using sluggable doctrine2 extension

Julio Montoya 12 years ago
parent
commit
9e531b5930

+ 4 - 2
composer.json

@@ -1,7 +1,8 @@
 {
     "autoload": {
         "psr-0": {
-            "Entity" : "main/inc/"
+            "Entity" : "main/inc/",
+            "Gedmo": "vendor/gedmo/doctrine-extensions/lib'"
         },
         "classmap": [
             "main/auth",
@@ -35,7 +36,8 @@
         "doctrine/migrations": "dev-master",
         "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev",
         "pagerfanta/pagerfanta": "dev-master",
-        "knplabs/knp-menu": "2.0.*@dev"
+        "knplabs/knp-menu": "2.0.*@dev",
+        "gedmo/doctrine-extensions": "2.3.*@dev"
     },
     "minimum-stability": "dev"
 }

+ 223 - 136
composer.lock

@@ -1,5 +1,5 @@
 {
-    "hash": "5a0e689cc41a9a38d2037ef81b325e36",
+    "hash": "00969618f2f0b10a233fb67916e231af",
     "packages": [
         {
             "name": "dflydev/doctrine-orm-service-provider",
@@ -7,12 +7,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-doctrine-orm-service-provider",
-                "reference": "12956355cc7aff283f833e2b17fb6521ed9e17d8"
+                "reference": "b925a32d4657f34b33fb7c7406f6e830aee28192"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/dflydev/dflydev-doctrine-orm-service-provider/archive/12956355cc7aff283f833e2b17fb6521ed9e17d8.zip",
-                "reference": "12956355cc7aff283f833e2b17fb6521ed9e17d8",
+                "url": "https://github.com/dflydev/dflydev-doctrine-orm-service-provider/archive/b925a32d4657f34b33fb7c7406f6e830aee28192.zip",
+                "reference": "b925a32d4657f34b33fb7c7406f6e830aee28192",
                 "shasum": ""
             },
             "require": {
@@ -27,14 +27,13 @@
             "suggest": {
                 "dflydev/psr0-resource-locator-service-provider": "1.0.*@dev"
             },
-            "time": "2012-11-20 17:11:41",
+            "time": "2012-12-30 23:41:22",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.0-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Dflydev\\Cilex\\Provider\\DoctrineOrm": "src",
@@ -73,25 +72,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common",
-                "reference": "a890fe1b689ed65c52bf4a7e64333a27b3c400d6"
+                "reference": "bc6bc47132613b28a58b7293dfd7872d9e3bcff3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/common/archive/a890fe1b689ed65c52bf4a7e64333a27b3c400d6.zip",
-                "reference": "a890fe1b689ed65c52bf4a7e64333a27b3c400d6",
+                "url": "https://github.com/doctrine/common/archive/bc6bc47132613b28a58b7293dfd7872d9e3bcff3.zip",
+                "reference": "bc6bc47132613b28a58b7293dfd7872d9e3bcff3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
-            "time": "2012-12-18 00:45:03",
+            "time": "2013-01-08 17:20:32",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.4.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Doctrine\\Common\\": "lib/"
@@ -121,7 +119,7 @@
                     "email": "kontakt@beberlei.de"
                 },
                 {
-                    "name": "Johannes Schmitt",
+                    "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
                     "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
@@ -143,26 +141,25 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal",
-                "reference": "63b7ef12a51fab0df4588dbd21bd1a3613bc0362"
+                "reference": "2f3377c0f28b276655a11ed54d0b2ac7ba5ad2d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/dbal/archive/63b7ef12a51fab0df4588dbd21bd1a3613bc0362.zip",
-                "reference": "63b7ef12a51fab0df4588dbd21bd1a3613bc0362",
+                "url": "https://github.com/doctrine/dbal/archive/2f3377c0f28b276655a11ed54d0b2ac7ba5ad2d3.zip",
+                "reference": "2f3377c0f28b276655a11ed54d0b2ac7ba5ad2d3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
                 "doctrine/common": ">=2.3-dev,<2.5-dev"
             },
-            "time": "2012-12-23 21:25:15",
+            "time": "2013-01-08 15:37:28",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.4.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Doctrine\\DBAL\\": "lib/"
@@ -207,12 +204,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/migrations",
-                "reference": "6e916d8e39b4963d6fd52622fd9ac797dce82837"
+                "reference": "e1f6efcd94993b493de5c6a413cbc327ea9c0caa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/migrations/archive/6e916d8e39b4963d6fd52622fd9ac797dce82837.zip",
-                "reference": "6e916d8e39b4963d6fd52622fd9ac797dce82837",
+                "url": "https://github.com/doctrine/migrations/archive/e1f6efcd94993b493de5c6a413cbc327ea9c0caa.zip",
+                "reference": "e1f6efcd94993b493de5c6a413cbc327ea9c0caa",
                 "shasum": ""
             },
             "require": {
@@ -226,9 +223,8 @@
             "suggest": {
                 "symfony/console": "to run the migration from the console"
             },
-            "time": "2012-12-26 14:01:23",
+            "time": "2012-12-27 16:39:29",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Doctrine\\DBAL\\Migrations": "lib"
@@ -262,24 +258,24 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/doctrine/doctrine2.git",
-                "reference": "90b6d5e293147a0268ca005362ff50343bc6dc0f"
+                "reference": "0b2d3d4f5d41c56fa07ff8d7ada406ec8bb34046"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/doctrine2/archive/90b6d5e293147a0268ca005362ff50343bc6dc0f.zip",
-                "reference": "90b6d5e293147a0268ca005362ff50343bc6dc0f",
+                "url": "https://github.com/doctrine/doctrine2/archive/0b2d3d4f5d41c56fa07ff8d7ada406ec8bb34046.zip",
+                "reference": "0b2d3d4f5d41c56fa07ff8d7ada406ec8bb34046",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
                 "ext-pdo": "*",
                 "symfony/console": "2.*",
-                "doctrine/dbal": ">=2.3-dev,<2.5-dev"
+                "doctrine/dbal": ">=2.4-dev,<2.5-dev"
             },
             "suggest": {
                 "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
             },
-            "time": "2012-12-24 09:40:52",
+            "time": "2013-01-06 18:16:12",
             "bin": [
                 "bin/doctrine",
                 "bin/doctrine.php"
@@ -290,7 +286,6 @@
                     "dev-master": "2.4.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Doctrine\\ORM\\": "lib/"
@@ -327,18 +322,87 @@
                 "orm"
             ]
         },
+        {
+            "name": "gedmo/doctrine-extensions",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/l3pp4rd/DoctrineExtensions.git",
+                "reference": "8e004cf25a68f0812efbce9b7c349fe0c750c691"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/8e004cf25a68f0812efbce9b7c349fe0c750c691.zip",
+                "reference": "8e004cf25a68f0812efbce9b7c349fe0c750c691",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2",
+                "doctrine/common": ">=2.2,<2.5-dev"
+            },
+            "require-dev": {
+                "doctrine/mongodb": ">=1.0.0-BETA1",
+                "doctrine/mongodb-odm": ">=1.0.0-BETA6",
+                "doctrine/orm": ">=2.2",
+                "doctrine/dbal": ">=2.2",
+                "symfony/yaml": "2.*"
+            },
+            "suggest": {
+                "doctrine/orm": ">=2.2",
+                "doctrine/dbal": ">=2.2",
+                "doctrine/mongodb": ">=1.0.0",
+                "doctrine/mongodb-odm": ">=1.0.0-BETA7"
+            },
+            "time": "2013-01-09 08:33:47",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Gedmo": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gediminas Morkevicius",
+                    "email": "gediminas.morkevicius@gmail.com"
+                }
+            ],
+            "description": "Doctrine2 behavioral extensions",
+            "homepage": "http://gediminasm.org/",
+            "keywords": [
+                "tree",
+                "behaviors",
+                "doctrine2",
+                "extensions",
+                "gedmo",
+                "sluggable",
+                "loggable",
+                "translatable",
+                "nestedset",
+                "sortable",
+                "timestampable"
+            ]
+        },
         {
             "name": "knplabs/knp-menu",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "http://github.com/KnpLabs/KnpMenu.git",
-                "reference": "884131c2d8b14b8d6abf676d221439bfce7d73ab"
+                "reference": "730bc37232f5f813822acf80edfbd89381ea5971"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/KnpLabs/KnpMenu/archive/884131c2d8b14b8d6abf676d221439bfce7d73ab.zip",
-                "reference": "884131c2d8b14b8d6abf676d221439bfce7d73ab",
+                "url": "https://github.com/KnpLabs/KnpMenu/archive/730bc37232f5f813822acf80edfbd89381ea5971.zip",
+                "reference": "730bc37232f5f813822acf80edfbd89381ea5971",
                 "shasum": ""
             },
             "require": {
@@ -354,14 +418,13 @@
                 "silex/silex": "for the integration with your silex application",
                 "twig/twig": "for the TwigRenderer and the integration with your templates"
             },
-            "time": "2012-12-11 22:43:19",
+            "time": "2012-12-27 13:04:16",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.0.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Knp\\Menu\\": "src/"
@@ -398,33 +461,37 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog",
-                "reference": "52b454f89041c41c548bc242482aaf9dc6fee5d8"
+                "reference": "1.3.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/Seldaek/monolog/archive/52b454f89041c41c548bc242482aaf9dc6fee5d8.zip",
-                "reference": "52b454f89041c41c548bc242482aaf9dc6fee5d8",
+                "url": "https://github.com/Seldaek/monolog/archive/1.3.0.zip",
+                "reference": "1.3.0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.3.0",
+                "psr/log": ">=1.0,<2.0"
             },
             "require-dev": {
-                "mlehner/gelf-php": "1.0.*"
+                "mlehner/gelf-php": "1.0.*",
+                "doctrine/couchdb": "dev-master",
+                "raven/raven": "0.3.*"
             },
             "suggest": {
                 "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-                "ext-mongo": "Allow sending log messages to a MongoDB server"
+                "ext-mongo": "Allow sending log messages to a MongoDB server",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "raven/raven": "Allow sending log messages to a Sentry server"
             },
-            "time": "2012-12-21 09:35:52",
+            "time": "2013-01-07 20:26:46",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.3.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Monolog": "src/"
@@ -442,11 +509,12 @@
                     "role": "Developer"
                 }
             ],
-            "description": "Logging for PHP 5.3",
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
             "homepage": "http://github.com/Seldaek/monolog",
             "keywords": [
                 "log",
-                "logging"
+                "logging",
+                "psr-3"
             ]
         },
         {
@@ -473,7 +541,6 @@
             },
             "time": "2012-08-22 21:56:31",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Pagerfanta\\": "src/"
@@ -502,25 +569,24 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Pimple.git",
-                "reference": "v1.0.1"
+                "reference": "d58cec632dfdd3305d6b4f2563a5cf2a75b4d978"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Pimple/archive/v1.0.1.zip",
-                "reference": "v1.0.1",
+                "url": "https://github.com/fabpot/Pimple/archive/d58cec632dfdd3305d6b4f2563a5cf2a75b4d978.zip",
+                "reference": "d58cec632dfdd3305d6b4f2563a5cf2a75b4d978",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2012-11-11 08:32:34",
+            "time": "2013-01-07 10:39:26",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.0.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Pimple": "lib/"
@@ -543,18 +609,56 @@
                 "container"
             ]
         },
+        {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log",
+                "reference": "1.0.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/php-fig/log/archive/1.0.0.zip",
+                "reference": "1.0.0",
+                "shasum": ""
+            },
+            "time": "2012-12-21 11:40:51",
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ]
+        },
         {
             "name": "silex/silex",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Silex.git",
-                "reference": "bd523d5970bb093d1d2c709e91a7f72b70c39108"
+                "reference": "d6243e37fcf78aadf679141ecb96b8eefed7a203"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Silex/archive/bd523d5970bb093d1d2c709e91a7f72b70c39108.zip",
-                "reference": "bd523d5970bb093d1d2c709e91a7f72b70c39108",
+                "url": "https://github.com/fabpot/Silex/archive/d6243e37fcf78aadf679141ecb96b8eefed7a203.zip",
+                "reference": "d6243e37fcf78aadf679141ecb96b8eefed7a203",
                 "shasum": ""
             },
             "require": {
@@ -589,14 +693,13 @@
                 "symfony/css-selector": ">=2.1,<2.3-dev",
                 "symfony/dom-crawler": ">=2.1,<2.3-dev"
             },
-            "time": "2012-12-18 11:32:45",
+            "time": "2013-01-10 07:32:36",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.0.x-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Silex": "src/"
@@ -647,7 +750,6 @@
                     "dev-master": "4.1-dev"
                 }
             },
-            "installation-source": "dist",
             "autoload": {
                 "files": [
                     "lib/swift_required.php"
@@ -680,25 +782,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config",
-                "reference": "ab422ad472259c7775d70831182f586f444c77a3"
+                "reference": "v2.2.0-BETA1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Config/archive/ab422ad472259c7775d70831182f586f444c77a3.zip",
-                "reference": "ab422ad472259c7775d70831182f586f444c77a3",
+                "url": "https://github.com/symfony/Config/archive/v2.2.0-BETA1.zip",
+                "reference": "v2.2.0-BETA1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-20 07:41:17",
+            "time": "2013-01-05 17:52:40",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.2-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Config\\": ""
@@ -728,25 +829,24 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console",
-                "reference": "388ea8dbc1b3e1f96721e2799eb2d037e411a281"
+                "reference": "v2.2.0-BETA1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Console/archive/388ea8dbc1b3e1f96721e2799eb2d037e411a281.zip",
-                "reference": "388ea8dbc1b3e1f96721e2799eb2d037e411a281",
+                "url": "https://github.com/symfony/Console/archive/v2.2.0-BETA1.zip",
+                "reference": "v2.2.0-BETA1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-19 07:09:49",
+            "time": "2013-01-08 18:17:41",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.2-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Console\\": ""
@@ -776,12 +876,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection",
-                "reference": "32ad6cccb2c38d7ac87217fae459083438f05634"
+                "reference": "v2.2.0-BETA1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/DependencyInjection/archive/32ad6cccb2c38d7ac87217fae459083438f05634.zip",
-                "reference": "32ad6cccb2c38d7ac87217fae459083438f05634",
+                "url": "https://github.com/symfony/DependencyInjection/archive/v2.2.0-BETA1.zip",
+                "reference": "v2.2.0-BETA1",
                 "shasum": ""
             },
             "require": {
@@ -795,14 +895,13 @@
                 "symfony/yaml": "2.2.*",
                 "symfony/config": "2.2.*"
             },
-            "time": "2012-12-19 07:09:49",
+            "time": "2013-01-08 18:17:41",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.2-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\DependencyInjection\\": ""
@@ -832,12 +931,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher",
-                "reference": "0e9d69646306e11d03dde4a29e79cd09d9567cb9"
+                "reference": "593ca3bb9ed5eccc1156c402102d9b5bb07cd783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/EventDispatcher/archive/0e9d69646306e11d03dde4a29e79cd09d9567cb9.zip",
-                "reference": "0e9d69646306e11d03dde4a29e79cd09d9567cb9",
+                "url": "https://github.com/symfony/EventDispatcher/archive/593ca3bb9ed5eccc1156c402102d9b5bb07cd783.zip",
+                "reference": "593ca3bb9ed5eccc1156c402102d9b5bb07cd783",
                 "shasum": ""
             },
             "require": {
@@ -850,9 +949,8 @@
                 "symfony/dependency-injection": "2.1.*",
                 "symfony/http-kernel": "2.1.*"
             },
-            "time": "2012-12-27 08:21:49",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\EventDispatcher": ""
@@ -882,12 +980,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Form",
-                "reference": "2cc2a32b6567e974d63f5ac6514db33b1b265dde"
+                "reference": "ef499c49a08833089ebfb175e28f48ac5d3e8a53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Form/archive/2cc2a32b6567e974d63f5ac6514db33b1b265dde.zip",
-                "reference": "2cc2a32b6567e974d63f5ac6514db33b1b265dde",
+                "url": "https://github.com/symfony/Form/archive/ef499c49a08833089ebfb175e28f48ac5d3e8a53.zip",
+                "reference": "ef499c49a08833089ebfb175e28f48ac5d3e8a53",
                 "shasum": ""
             },
             "require": {
@@ -904,9 +1002,8 @@
                 "symfony/validator": "2.1.*",
                 "symfony/http-foundation": "2.1.*"
             },
-            "time": "2012-12-20 17:52:51",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Form": ""
@@ -936,20 +1033,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation",
-                "reference": "v2.1.6"
+                "reference": "229cc2272d62f4141c17254d15511532e6e46ce0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/HttpFoundation/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/HttpFoundation/archive/229cc2272d62f4141c17254d15511532e6e46ce0.zip",
+                "reference": "229cc2272d62f4141c17254d15511532e6e46ce0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-14 21:03:29",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\HttpFoundation": "",
@@ -980,12 +1076,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel",
-                "reference": "17fb2aeb877649a144260681bc460a3dd258e344"
+                "reference": "daba04e69bc8cccc7d81d2ef82be81c36d783ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/HttpKernel/archive/17fb2aeb877649a144260681bc460a3dd258e344.zip",
-                "reference": "17fb2aeb877649a144260681bc460a3dd258e344",
+                "url": "https://github.com/symfony/HttpKernel/archive/daba04e69bc8cccc7d81d2ef82be81c36d783ae2.zip",
+                "reference": "daba04e69bc8cccc7d81d2ef82be81c36d783ae2",
                 "shasum": ""
             },
             "require": {
@@ -1011,9 +1107,8 @@
                 "symfony/dependency-injection": "2.1.*",
                 "symfony/finder": "2.1.*"
             },
-            "time": "2012-12-21 10:42:20",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\HttpKernel": ""
@@ -1043,12 +1138,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Locale",
-                "reference": "v2.1.6"
+                "reference": "d1819fbf750d58ad1d2f6213c337afe8081b75f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Locale/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/Locale/archive/d1819fbf750d58ad1d2f6213c337afe8081b75f0.zip",
+                "reference": "d1819fbf750d58ad1d2f6213c337afe8081b75f0",
                 "shasum": ""
             },
             "require": {
@@ -1057,9 +1152,8 @@
             "suggest": {
                 "ext-intl": ">=5.3.3"
             },
-            "time": "2012-12-15 17:28:15",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Locale": ""
@@ -1089,20 +1183,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/OptionsResolver",
-                "reference": "v2.1.6"
+                "reference": "1a1319747462c2d457c3e1c8c2c9a26ad4bcb67b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/OptionsResolver/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/OptionsResolver/archive/1a1319747462c2d457c3e1c8c2c9a26ad4bcb67b.zip",
+                "reference": "1a1319747462c2d457c3e1c8c2c9a26ad4bcb67b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-06 10:00:55",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\OptionsResolver": ""
@@ -1137,12 +1230,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing",
-                "reference": "eecf36850760b137fcd4f5025c64014de722874c"
+                "reference": "v2.2.0-BETA1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Routing/archive/eecf36850760b137fcd4f5025c64014de722874c.zip",
-                "reference": "eecf36850760b137fcd4f5025c64014de722874c",
+                "url": "https://github.com/symfony/Routing/archive/v2.2.0-BETA1.zip",
+                "reference": "v2.2.0-BETA1",
                 "shasum": ""
             },
             "require": {
@@ -1159,14 +1252,13 @@
                 "symfony/config": "2.2.*",
                 "symfony/yaml": "2.2.*"
             },
-            "time": "2012-12-20 07:41:17",
+            "time": "2013-01-07 11:20:12",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.2-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Routing\\": ""
@@ -1196,12 +1288,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Security",
-                "reference": "v2.1.6"
+                "reference": "6335d042d57da0016da722abefd9e1c519c88f2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Security/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/Security/archive/6335d042d57da0016da722abefd9e1c519c88f2c.zip",
+                "reference": "6335d042d57da0016da722abefd9e1c519c88f2c",
                 "shasum": ""
             },
             "require": {
@@ -1225,9 +1317,8 @@
                 "symfony/validator": "2.1.*",
                 "symfony/routing": "2.1.*"
             },
-            "time": "2012-12-11 10:40:22",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Security": ""
@@ -1257,12 +1348,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Translation",
-                "reference": "v2.1.6"
+                "reference": "331f25563a58ec768b59137f8ef34cb5fb1ab330"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Translation/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/Translation/archive/331f25563a58ec768b59137f8ef34cb5fb1ab330.zip",
+                "reference": "331f25563a58ec768b59137f8ef34cb5fb1ab330",
                 "shasum": ""
             },
             "require": {
@@ -1276,9 +1367,8 @@
                 "symfony/config": "2.1.*",
                 "symfony/yaml": "2.1.*"
             },
-            "time": "2012-12-06 10:00:55",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Translation": ""
@@ -1308,12 +1398,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/TwigBridge",
-                "reference": "5f83b3f000eedc25e5fa538bd2ff928e21e2327c"
+                "reference": "a13ff0ad1ac7716e8307d10f0de98704bb70399c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/TwigBridge/archive/5f83b3f000eedc25e5fa538bd2ff928e21e2327c.zip",
-                "reference": "5f83b3f000eedc25e5fa538bd2ff928e21e2327c",
+                "url": "https://github.com/symfony/TwigBridge/archive/a13ff0ad1ac7716e8307d10f0de98704bb70399c.zip",
+                "reference": "a13ff0ad1ac7716e8307d10f0de98704bb70399c",
                 "shasum": ""
             },
             "require": {
@@ -1338,14 +1428,13 @@
                 "symfony/security": "2.2.*",
                 "symfony/http-kernel": "2.2.*"
             },
-            "time": "2012-12-22 14:51:06",
+            "time": "2013-01-08 13:43:29",
             "type": "symfony-bridge",
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.2-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Bridge\\Twig\\": ""
@@ -1375,12 +1464,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Validator",
-                "reference": "v2.1.6"
+                "reference": "822dd14c17f378a627e36d8954c01669a654f19e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Validator/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/Validator/archive/822dd14c17f378a627e36d8954c01669a654f19e.zip",
+                "reference": "822dd14c17f378a627e36d8954c01669a654f19e",
                 "shasum": ""
             },
             "require": {
@@ -1396,9 +1485,8 @@
                 "symfony/http-foundation": "2.1.*",
                 "symfony/yaml": "2.1.*"
             },
-            "time": "2012-12-12 13:03:58",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Validator": ""
@@ -1428,20 +1516,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml",
-                "reference": "v2.1.6"
+                "reference": "7dd042765a3299d7cb1627ca9e6ffdb59fc54058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Yaml/archive/v2.1.6.zip",
-                "reference": "v2.1.6",
+                "url": "https://github.com/symfony/Yaml/archive/7dd042765a3299d7cb1627ca9e6ffdb59fc54058.zip",
+                "reference": "7dd042765a3299d7cb1627ca9e6ffdb59fc54058",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-06 10:00:55",
+            "time": "2013-01-09 08:51:07",
             "type": "library",
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Symfony\\Component\\Yaml": ""
@@ -1470,25 +1557,24 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Twig.git",
-                "reference": "a65e7e4e2e5726a42a29e609fad008f8a9600594"
+                "reference": "3111e1265db1026323c589a5bd2d152871d7bbab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Twig/archive/a65e7e4e2e5726a42a29e609fad008f8a9600594.zip",
-                "reference": "a65e7e4e2e5726a42a29e609fad008f8a9600594",
+                "url": "https://github.com/fabpot/Twig/archive/3111e1265db1026323c589a5bd2d152871d7bbab.zip",
+                "reference": "3111e1265db1026323c589a5bd2d152871d7bbab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2012-12-25 10:06:30",
+            "time": "2013-01-08 16:56:12",
             "type": "library",
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.12-dev"
                 }
             },
-            "installation-source": "source",
             "autoload": {
                 "psr-0": {
                     "Twig_": "lib/"
@@ -1529,6 +1615,7 @@
         "dflydev/doctrine-orm-service-provider": 20,
         "doctrine/migrations": 20,
         "pagerfanta/pagerfanta": 20,
-        "knplabs/knp-menu": 20
+        "knplabs/knp-menu": 20,
+        "gedmo/doctrine-extensions": 20
     }
 }

+ 2 - 1
main/css/base.css

@@ -2603,7 +2603,7 @@ div.admin_section h4 {
 }
 
 .ribbon .rib {
-    height: 28px;
+    height: 30px;
     width: 120px;
     display: block;
     line-height: 1.3;
@@ -2636,6 +2636,7 @@ div.admin_section h4 {
     float:left;
     line-height: 16px;
     padding-top: 5px;
+    margin-top: 0px;
 }
 
 .ribbon .rib-total {

+ 16 - 17
main/inc/Entity/EntityPages.php

@@ -1,7 +1,12 @@
 <?php
-
 namespace Entity;
-use Doctrine\Mapping as ORM;
+
+use Gedmo\Mapping\Annotation as Gedmo;
+use Doctrine\ORM\Mapping as ORM;
+
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\GeneratedValue;
 
 /**
  * EntityPages
@@ -24,14 +29,14 @@ class EntityPages
     /**
      * @var string
      *
-     * @Column(name="title", type="string", length=255, precision=0, scale=0, nullable=false, unique=false)
+     * @Column(name="title", type="string", length=255)
      */
     private $title;
 
     /**
      * @var string
-     *
-     * @Column(name="slug", type="string", length=255, precision=0, scale=0, nullable=false, unique=false)
+     * @Gedmo\Slug(fields={"title"})
+     * @Column(name="slug", type="string", length=255)
      */
     private $slug;
 
@@ -107,18 +112,6 @@ class EntityPages
         return $this->title;
     }
 
-    /**
-     * Set slug
-     *
-     * @param string $slug
-     * @return EntityPages
-     */
-    public function setSlug($slug)
-    {
-        $this->slug = $slug;
-        return $this;
-    }
-
     /**
      * Get slug
      *
@@ -129,6 +122,12 @@ class EntityPages
         return $this->slug;
     }
 
+    public function setSlug($slug)
+    {
+        $this->slug = $slug;
+        return $this;
+    }
+
     /**
      * Set content
      *

+ 17 - 17
main/inc/global.inc.php

@@ -116,7 +116,6 @@ require_once __DIR__.'../../../vendor/autoload.php';
 
 //Start Silex
 use Silex\Application;
-use Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider;
 
 $app = new Application();
 $app['configuration_file'] = $main_configuration_file_path;
@@ -199,10 +198,8 @@ $app->register(new Silex\Provider\DoctrineServiceProvider(), array(
     )
 ));
 
-
-
 //Setting Doctrine ORM
-$app->register(new DoctrineOrmServiceProvider, array(
+$app->register(new Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider, array(
     "orm.proxies_dir" => $app['db.orm.proxies_dir'],
     "orm.em.options" => array(
         "mappings" => array(
@@ -215,6 +212,15 @@ $app->register(new DoctrineOrmServiceProvider, array(
     ),
 ));
 
+//Doctrine extensions
+
+$timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
+$app['db.event_manager']->addEventSubscriber($timestampableListener);
+
+$sluggableListener = new \Gedmo\Sluggable\SluggableListener();
+$app['db.event_manager']->addEventSubscriber($sluggableListener);
+
+
 //Testing with another silex service provider
 /*
 // Register Doctrine ORM
@@ -234,7 +240,6 @@ $app->register(new Nutwerk\Provider\DoctrineORMServiceProvider(), array(
 
 //Creating Chamilo service provider
 use Silex\ServiceProviderInterface;
-//use Sonata\AdminBundle\Controller\CRUDController;
 
 class ChamiloServiceProvider implements ServiceProviderInterface {
     public function register(Application $app) {
@@ -242,23 +247,18 @@ class ChamiloServiceProvider implements ServiceProviderInterface {
         $app['template'] = $app->share(function() use($app){
             return new Template(null, $app);
         });
-
-        /*$app['sonata.crud_controller'] = $app->share(function() use ($app) {
-            $controller = new CRUDController();
-            $controller->setContainer($app);
-            $controller->configure();
-            return $controller;
-        });*/
-
-        //Formvalidator
-        $app['form_validator'] = $app->share(function() use($app){
-            return new FormValidator();
-        });
     }
     public function boot(Application $app) {
     }
 }
 
+$app->register(new Silex\Provider\ServiceControllerServiceProvider());
+
+$app['pages.controller'] = $app->share(function() use ($app) {
+    return new PagesController($app['pages.repository']);
+});
+
+
 //Registering Chamilo service provider
 $app->register(new ChamiloServiceProvider(), array());
 

+ 13 - 12
main/pages/index.php

@@ -27,6 +27,7 @@ class PagesController {
             $form->bindRequest($request);
             if ($form->isValid()) {
                 $page = $form->getData();
+                $page->setSlug($page->getTitle());
                 $em = $app['orm.em'];
                 /*$page_data = $form->getData();
                 $page->setContent($page_data['content']);
@@ -48,7 +49,6 @@ class PagesController {
         if (empty($page)) {
             $app->abort(404, "Page $id does not exist.");
         }
-
         $form = $this->getForm($app, $page);
 
         if ('POST' == $request->getMethod()) {
@@ -56,6 +56,7 @@ class PagesController {
             if ($form->isValid()) {
                 $em = $app['orm.em'];
                 //$page = $form->getData();
+                $page->setTitle($page->getTitle());
                 $em->persist($page);
                 $em->flush();
                 return $app->redirect($app['url_generator']->generate('show', array('id'=> $page->getId())), 201);
@@ -70,7 +71,6 @@ class PagesController {
         return $app['template']->render_template('pages/show.tpl', array(
             'page' => $page,
             'actions' => $actions,
-
         ));
     }
 
@@ -91,9 +91,8 @@ class PagesController {
 
         $em = $app['orm.em'];
         $dql = 'SELECT a FROM Entity\EntityPages a';
-        $query = $em->createQuery($dql)->setFirstResult(0)
-                    ->setMaxResults(100);
-        
+        $query = $em->createQuery($dql)->setFirstResult(0)->setMaxResults(100);
+
         //or using the repository
         //
         //$query = $em->getRepository('Entity\EntityPages')->getLatestPages();
@@ -104,6 +103,7 @@ class PagesController {
         $routeGenerator = function($page) use ($app) {
             return $app['url_generator']->generate('list', array('page' => $page));
         };
+        $page = intval($app['request']->get('page'));
 
         $pagerfanta->setMaxPerPage(2); // 10 by default
         $pagerfanta->setCurrentPage($page);
@@ -144,17 +144,18 @@ class PagesController {
     }
 }
 
-//$app->match('/{page}', 'PagesController::indexAction')->bind('index');
-$app->get('/', 'PagesController::listAction')->bind('index');
-$app->get('/page', 'PagesController::listAction')->bind('list');
-$app->get('/show/{id}', 'PagesController::showAction')
+$app->get('/', 'pages.controller:listAction')->bind('index');
+
+$app->get('/page', 'pages.controller:listAction')->bind('list');
+
+$app->get('/show/{id}', 'pages.controller:showAction')
     ->bind('show')
     ->assert('id', '\d+');
-$app->get('/delete/{id}', 'PagesController::deleteAction')
+$app->get('/delete/{id}', 'pages.controller:deleteAction')
     ->bind('delete')
     ->assert('id', '\d+');
-$app->match('/edit/{id}', 'PagesController::editAction', 'GET|POST')
+$app->match('/edit/{id}', 'pages.controller:editAction', 'GET|POST')
     ->bind('edit')
     ->assert('id', '\d+');
-$app->match('/add', 'PagesController::addAction', 'GET|POST')->bind('add');
+$app->match('/add', 'pages.controller:addAction', 'GET|POST')->bind('add');
 $app->run();

+ 3 - 1
main/template/default/form/form_custom_template.tpl

@@ -4,7 +4,9 @@
     {% for page in pages %}
         {{ page.title }} -
         {{ page.slug }} -
-        {{ page.description }} - <a href="{{ url('edit', {id: page.id}) }}">Edit</a> <a href="{{ url('delete', {id: page.id}) }}">Delete</a>
+        {{ page.created }} -
+        {{ page.updated }} -
+        <a href="{{ url('edit', {id: page.id}) }}">Edit</a> <a href="{{ url('delete', {id: page.id}) }}">Delete</a>
         {{ loop.index }}/{{ loop.length }}
         <br />
     {% endfor %}

+ 1 - 1
main/template/default/pages/show.tpl

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit2aa2874c6d735f4d630d562668e620de::getLoader();
+return ComposerAutoloaderInit5d0b45012cbd26cc5617b41b3b9c50be::getLoader();

+ 2 - 0
vendor/composer/autoload_namespaces.php

@@ -24,10 +24,12 @@ return array(
     'Symfony\\Bridge\\Twig\\' => $vendorDir . '/symfony/twig-bridge/',
     'Silex' => $vendorDir . '/silex/silex/src/',
     'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs',
+    'Psr\\Log\\' => $vendorDir . '/psr/log/',
     'Pimple' => $vendorDir . '/pimple/pimple/lib/',
     'Pagerfanta\\' => $vendorDir . '/pagerfanta/pagerfanta/src/',
     'Monolog' => $vendorDir . '/monolog/monolog/src/',
     'Knp\\Menu\\' => $vendorDir . '/knplabs/knp-menu/src/',
+    'Gedmo' => array($baseDir . '/vendor/gedmo/doctrine-extensions/lib\'', $vendorDir . '/gedmo/doctrine-extensions/lib/'),
     'Entity' => $baseDir . '/main/inc/',
     'Doctrine\\ORM\\' => $vendorDir . '/doctrine/orm/lib/',
     'Doctrine\\DBAL\\Migrations' => $vendorDir . '/doctrine/migrations/lib',

+ 4 - 4
vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php generated by Composer
 
-class ComposerAutoloaderInit2aa2874c6d735f4d630d562668e620de
+class ComposerAutoloaderInit5d0b45012cbd26cc5617b41b3b9c50be
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit2aa2874c6d735f4d630d562668e620de
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit2aa2874c6d735f4d630d562668e620de', 'loadClassLoader'));
+        spl_autoload_register(array('ComposerAutoloaderInit5d0b45012cbd26cc5617b41b3b9c50be', 'loadClassLoader'));
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit2aa2874c6d735f4d630d562668e620de', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit5d0b45012cbd26cc5617b41b3b9c50be', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -36,7 +36,7 @@ class ComposerAutoloaderInit2aa2874c6d735f4d630d562668e620de
             $loader->addClassMap($classMap);
         }
 
-        $loader->register();
+        $loader->register(true);
 
         require $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php';
 

File diff suppressed because it is too large
+ 307 - 315
vendor/composer/installed.json


Some files were not shown because too many files changed in this diff