Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit 06db939969e0 · 2022-02-04T16:25:09.000+01:00
* 6.0:
  Update some code
diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst
@@ -102,7 +102,7 @@ Changing the cache directory can be achieved by overriding the
     {
         // ...
 
-        public function getCacheDir()
+        public function getCacheDir(): string
         {
             return dirname(__DIR__).'/var/'.$this->environment.'/cache';
         }
@@ -140,7 +140,7 @@ your application::
     {
         // ...
 
-        public function getLogDir()
+        public function getLogDir(): string
         {
             return dirname(__DIR__).'/var/'.$this->environment.'/log';
         }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ Changing the cache directory can be achieved by overriding the`
`102`	`102`	`{`
`103`	`103`	`// ...`
`104`	`104`
`105`		`- public function getCacheDir()`
	`105`	`+ public function getCacheDir(): string`
`106`	`106`	`{`
`107`	`107`	`return dirname(__DIR__).'/var/'.$this->environment.'/cache';`
`108`	`108`	`}`
`@@ -140,7 +140,7 @@ your application::`
`140`	`140`	`{`
`141`	`141`	`// ...`
`142`	`142`
`143`		`- public function getLogDir()`
	`143`	`+ public function getLogDir(): string`
`144`	`144`	`{`
`145`	`145`	`return dirname(__DIR__).'/var/'.$this->environment.'/log';`
`146`	`146`	`}`