Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 33734eb

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: force Composer to use PHP 5.3.3 when updating updated VENDORS for 2.3.37 Make use of getParameter() shortcut method
2 parents 7db148d + d0e9308 commit 33734eb

File tree

3 files changed

+47
-99
lines changed

3 files changed

+47
-99
lines changed

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
]
4242
},
4343
"config": {
44-
"bin-dir": "bin"
44+
"bin-dir": "bin",
45+
"platform": {
46+
"php": "5.3.9"
47+
}
4548
},
4649
"extra": {
4750
"symfony-app-dir": "app",

composer.lock

Lines changed: 42 additions & 97 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AppBundle/Controller/DefaultController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function indexAction(Request $request)
1515
{
1616
// replace this example code with whatever you need
1717
return $this->render('default/index.html.twig', array(
18-
'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..'),
18+
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..'),
1919
));
2020
}
2121
}

0 commit comments

Comments
 (0)