🚨 patch StyleCI

Troopers · Jan 24, 2017 · fd2a32e · fd2a32e
1 parent 27615c6
commit fd2a32e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/Monolog/Processor/GitProcessor.php b/Monolog/Processor/GitProcessor.php
@@ -32,19 +32,18 @@ private function getRevision()
 
         try {
             //Get revision number from .git
-            $gitRev = shell_exec("git rev-parse HEAD");
-            if(preg_match("/^[0-9a-f]{40}|[0-9a-f]{6,8}$/", $gitRev)){
+            $gitRev = shell_exec('git rev-parse HEAD');
+            if (preg_match('/^[0-9a-f]{40}|[0-9a-f]{6,8}$/', $gitRev)) {
                 return self::$cache = trim($gitRev);
             }
         } catch (\Exception $e) {
             error_log('GitProcessor, git rev-parse failed "'.$e->getMessage().'"');
         }
 
-
         try {
             $gitRev = file_get_contents($this->appRootDir.'/REVISION');
             //Get revision number from REVISION file
-            if(preg_match("/^[0-9a-f]{40}|[0-9a-f]{6,8}$/", $gitRev)){
+            if (preg_match('/^[0-9a-f]{40}|[0-9a-f]{6,8}$/', $gitRev)) {
                 return self::$cache = $gitRev;
             }
         } catch (\Exception $e) {
@@ -55,9 +54,10 @@ private function getRevision()
     }
 
     /**
-     * Clear Cache
+     * Clear Cache.
      */
-    static function clearCache() {
+    public static function clearCache()
+    {
         self::$cache = false;
     }
 }
diff --git a/Tests/GitRevision/GitRevsionTest.php b/Tests/GitRevision/GitRevsionTest.php
@@ -6,12 +6,13 @@
 
 class GitRevsionTest extends \PHPUnit_Framework_TestCase
 {
-    static $defaultPath = '/tmp';
+    public static $defaultPath = '/tmp';
 
     /**
      * @before
      */
-    public function before(){
+    public function before()
+    {
         chdir(self::$defaultPath);
         if (file_exists('REVISION')) {
             unlink('REVISION');
@@ -21,7 +22,8 @@ public function before(){
     /**
      * @after
      */
-    public function after() {
+    public function after()
+    {
         GitProcessor::clearCache();
     }
 
@@ -45,15 +47,15 @@ public function testGitRevisionWithGit()
         $gitProcessor = new GitProcessor($rootPath);
         $record = $gitProcessor([]);
 
-        $this->assertRegExp("/^[0-9a-f]{40}|[0-9a-f]{6,8}$/", $record['extra']['@git']);
+        $this->assertRegExp('/^[0-9a-f]{40}|[0-9a-f]{6,8}$/', $record['extra']['@git']);
     }
 
     public function testGitRevisionWithBadRevisionFile()
     {
         $rootPath = self::$defaultPath;
 
         $revisionFile = fopen('REVISION', 'w');
-        fputs($revisionFile, 'This is not a git commit sha');
+        fwrite($revisionFile, 'This is not a git commit sha');
         fclose($revisionFile);
 
         $gitProcessor = new GitProcessor($rootPath);
@@ -67,12 +69,12 @@ public function testGitRevisionWithGoodRevisionFile()
         $rootPath = self::$defaultPath;
 
         $revisionFile = fopen('REVISION', 'w');
-        fputs($revisionFile, sha1(time()));
+        fwrite($revisionFile, sha1(time()));
         fclose($revisionFile);
 
         $gitProcessor = new GitProcessor($rootPath);
         $record = $gitProcessor([]);
 
-        $this->assertRegExp("/^[0-9a-f]{40}|[0-9a-f]{6,8}$/", $record['extra']['@git']);
+        $this->assertRegExp('/^[0-9a-f]{40}|[0-9a-f]{6,8}$/', $record['extra']['@git']);
     }
 }