Partial merge with 1.10

composer.json

@@ -49,6 +49,8 @@
         "symfony/validator": "~2.3",
         "symfony/translation": "~2.3",
         "symfony/dependency-injection": "~2.3",
+        "symfony/filesystem": "~2.3",
+        "symfony/finder": "2.3.*@dev",
         "monolog/monolog" : ">=1.0.0",
         "symfony/config": "~2.3",
         "symfony/yaml": "~2.3",
@@ -58,10 +60,9 @@
         "dflydev/doctrine-orm-service-provider": "1.0.*@dev",
         "doctrine/migrations": "dev-master",
         "gedmo/doctrine-extensions": "2.3.*@dev",
-        "chamilo/chash": "dev-master",
         "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev",
         "pagerfanta/pagerfanta": "dev-master",
-        "franmomu/silex-pagerfanta-provider": "2.3.*@dev",
+        "franmomu/silex-pagerfanta-provider": "1.0.*@dev",
         "igorw/config-service-provider": "1.2.*@dev",
         "mpdf/mpdf": "v5.6.1",
         "ezyang/htmlpurifier": "v4.5.0",
@@ -77,10 +78,13 @@
         "neutron/silex-filesystem-provider": "dev-master",
         "jbroadway/urlify": "dev-master",
         "sensio/framework-extra-bundle": "2.3.*@dev",
+        "chamilo/chash": "dev-master",
+        "zendframework/zend-config": "2.3.*@dev",
+        "zendframework/zend-stdlib" : "2.3.*@dev",
         "flint/flint" : "~1.4"
     },
     "require-dev": {
-        "symfony/browser-kit": "2.3.*@dev",
+        "symfony/browser-kit": "~2.3",
         "symfony/web-profiler-bundle": "~2.3",
         "silex/web-profiler": "1.0.x-dev",
         "natxet/CssMin": "dev-master",

config/routing.yml

@@ -3,11 +3,10 @@ admin_login_check:
 admin_logout:
     pattern:   /admin/logout
 
-homepage:
-    path:      /homepage
+home:
+    path:      /home
     defaults:  { _controller: index.controller:indexAction, culture: en }
 
 example:
     resource: "src/ChamiloLMS/Resources/config/route_example.yml"
     prefix:   /example-route
-

main/inc/services.php

@@ -7,6 +7,12 @@
  * @package chamilo.services
  */
 
+// Needed to use the "entity" option in symfony forms
+use Doctrine\Common\Persistence\AbstractManagerRegistry;
+use FranMoreno\Silex\Provider\PagerfantaServiceProvider;
+use Silex\Application;
+use Silex\ServiceProviderInterface;
+use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
 
 // Flint
 $app->register(new Flint\Provider\ConfigServiceProvider());
@@ -20,13 +26,6 @@ $app->register(new Flint\Provider\RoutingServiceProvider(), array(
     ),
 ));
 
-// Monolog.
-use Doctrine\Common\Persistence\AbstractManagerRegistry;
-use FranMoreno\Silex\Provider\PagerfantaServiceProvider;
-use Silex\Application;
-use Silex\ServiceProviderInterface;
-use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
-
 // Monolog.
 if (is_writable($app['sys_temp_path'])) {
 

src/ChamiloLMS/Controller/BaseController.php

@@ -172,7 +172,7 @@ abstract class BaseController extends FlintController
 
     /**
      *
-     * @Route("/{id}/edit", requirements={"id" = "\d+"}})
+     * @Route("/{id}/edit", requirements={"id" = "\d+"})
      * @Method({"GET"})
      */
     public function editAction($id)

src/ChamiloLMS/Controller/IndexController.php

@@ -286,9 +286,7 @@ class IndexController extends CommonController
           ->getForm();
           return $app['template']->assign('form', $form->createView());
          */
-        $url = $app['url_generator']->generate('admin_login_check');
-        //var_dump($app['router']->generate('admin_login_check'));
-        $form = new \FormValidator('formLogin', 'POST', $url , null, array('class' => 'form-vertical'));
+        $form = new \FormValidator('formLogin', 'POST', $app['url_generator']->generate('admin_login_check'), null, array('class' => 'form-vertical'));
         $form->addElement(
             'text',
             'username',

src/ChamiloLMS/Provider/ReflectionControllerProvider.php

@@ -78,15 +78,15 @@ class ReflectionControllerProvider implements ControllerProviderInterface
 
                     $match = $controllers->match($routeObject->getPath(), $controllerName, $methodsToString);
 
-                    // setRequirements
+                    // Setting requirements
                     if (!empty($req)) {
                         foreach ($req as $key => $value) {
                             $match->assert($key, $value);
                         }
                     }
                     $defaults = $routeObject->getDefaults();
-                    //var_dump($routeObject);
-                    //var_dump($defaults);
+                    // Setting defaults
+
                     if (!empty($defaults)) {
                         foreach ($defaults as $key => $value) {
                             $match->value($key, $value);