Merge branch '2.3' into 2.6

fabpot · fabpot · commit bc212d2c6bc7 · 2015-02-16T10:38:49.000+01:00
* 2.3:
  updated year range in LICENSE
  Use getRootDir() rather than assuming __DIR__
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -31,6 +31,6 @@ public function registerBundles()
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2004-2014 Fabien Potencier`
	`1`	`+Copyright (c) 2004-2015 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ public function registerBundles()`
`31`	`31`
`32`	`32`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`33`	`33`	`{`
`34`		`- $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');`
	`34`	`+ $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');`
`35`	`35`	`}`
`36`	`36`	`}`