Fixed fallback behavior in getPhpFastCacheVersion method

Geolim4 · Geolim4 · commit 160968c7ca03 · 2018-05-08T17:56:45.000+02:00
diff --git a/lib/Phpfastcache/Api.php b/lib/Phpfastcache/Api.php
@@ -69,12 +69,15 @@ public static function getPhpFastCacheVersion($fallbackOnChangelog = true, $cach
         }
 
         if(\function_exists('shell_exec')){
-            $stdout = shell_exec('git describe --abbrev=0 --tags');
+            $command = 'git -C "' . __DIR__ . '" describe --abbrev=0 --tags';
+            $stdout = shell_exec($command);
             if(\is_string($stdout)){
                 $version = \trim($stdout);
                 return $version;
             }
-            throw new PhpfastcacheLogicException('The git command used to retrieve the PhpFastCache version has failed.');
+            if(!$fallbackOnChangelog){
+                throw new PhpfastcacheLogicException('The git command used to retrieve the PhpFastCache version has failed.');
+            }
         }
 
         if(!$fallbackOnChangelog){

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,15 @@ public static function getPhpFastCacheVersion($fallbackOnChangelog = true, $cach`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if(\function_exists('shell_exec')){`
`72`		`- $stdout = shell_exec('git describe --abbrev=0 --tags');`
	`72`	`+ $command = 'git -C "' . __DIR__ . '" describe --abbrev=0 --tags';`
	`73`	`+ $stdout = shell_exec($command);`
`73`	`74`	`if(\is_string($stdout)){`
`74`	`75`	`$version = \trim($stdout);`
`75`	`76`	`return $version;`
`76`	`77`	`}`
`77`		`- throw new PhpfastcacheLogicException('The git command used to retrieve the PhpFastCache version has failed.');`
	`78`	`+ if(!$fallbackOnChangelog){`
	`79`	`+ throw new PhpfastcacheLogicException('The git command used to retrieve the PhpFastCache version has failed.');`
	`80`	`+ }`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`if(!$fallbackOnChangelog){`