Merge branch '2.7' into 2.8

fabpot · fabpot · commit 1c4ec4accc7b · 2016-01-19T22:38:31.000+01:00
* 2.7:
  Improve text on the welcome page
  updated VENDORS for 2.7.9
  fixed typo
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig
@@ -11,7 +11,7 @@
                 <p>
                     <svg id="icon-status" width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z" fill="#759E1A"/></svg>
 
-                    Your application is ready to start working on it at:
+                    Your application is now ready. You can start working on it at:
                     <code>{{ base_dir }}/</code>
                 </p>
             </div>
@@ -35,7 +35,7 @@
                             c2.8,0,5-2.4,5-5.4V17.9h3.7c1.6,0,2.9,1.4,2.9,3.1V65.1L42.1,65.1z"/>
                     </svg>
 
-                    Read Symfony documentation to learn
+                    Read the documentation to learn
                     <a href="http://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION')[:3] }}/book/page_creation.html">
                         How to create your first page in Symfony
                     </a>
diff --git a/composer.lock b/composer.lock
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
@@ -15,7 +15,7 @@ public function indexAction(Request $request)
     {
         // replace this example code with whatever you need
         return $this->render('default/index.html.twig', array(
-            'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
+            'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),
         ));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function indexAction(Request $request)`
`15`	`15`	`{`
`16`	`16`	`// replace this example code with whatever you need`
`17`	`17`	`return $this->render('default/index.html.twig', array(`
`18`		`- 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),`
	`18`	`+ 'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),`
`19`	`19`	`));`
`20`	`20`	`}`
`21`	`21`	`}`