CS Fixes And Minor Tweaks

Author: GrahamCampbell

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -1,2 +1,3 @@
 /vendor
 /composer.lock
+/phpunit.xml

src/Gitonomy/Git/Admin.php

@@ -163,5 +163,4 @@ private static function getProcess($command, array $args = array(), array $optio
 
         return $process;
     }
-
 }

src/Gitonomy/Git/Blame.php

@@ -12,9 +12,9 @@
 
 namespace Gitonomy\Git;
 
+use Gitonomy\Git\Blame\Line;
 use Gitonomy\Git\Exception\InvalidArgumentException;
 use Gitonomy\Git\Parser\BlameParser;
-use Gitonomy\Git\Blame\Line;
 
 /**
  * @author Alexandre Salomé <[email protected]>

src/Gitonomy/Git/Commit.php

@@ -14,8 +14,8 @@
 
 use Gitonomy\Git\Diff\Diff;
 use Gitonomy\Git\Exception\InvalidArgumentException;
-use Gitonomy\Git\Exception\ReferenceNotFoundException;
 use Gitonomy\Git\Exception\ProcessException;
+use Gitonomy\Git\Exception\ReferenceNotFoundException;
 use Gitonomy\Git\Util\StringHelper;
 
 /**
@@ -223,7 +223,7 @@ public function getIncludingBranches($local = true, $remote = true)
         }
 
         $branchesName = explode("\n", trim(str_replace('*', '', $result)));
-        $branchesName = array_filter($branchesName, function($v) { return false === StringHelper::strpos($v, '->');});
+        $branchesName = array_filter($branchesName, function ($v) { return false === StringHelper::strpos($v, '->');});
         $branchesName = array_map('trim', $branchesName);
 
         $references = $this->repository->getReferences();

src/Gitonomy/Git/Parser/LogParser.php

@@ -12,8 +12,6 @@
 
 namespace Gitonomy\Git\Parser;
 
-use Gitonomy\Git\Exception\RuntimeException;
-
 class LogParser extends CommitParser
 {
     public $log = array();

src/Gitonomy/Git/Reference.php

@@ -39,7 +39,6 @@ public function delete()
         $this->repository->getReferences()->delete($this->getFullname());
     }
 
-
     public function getCommitHash()
     {
         if (null !== $this->commitHash) {

src/Gitonomy/Git/ReferenceBag.php

@@ -14,8 +14,8 @@
 
 use Gitonomy\Git\Exception\ReferenceNotFoundException;
 use Gitonomy\Git\Exception\RuntimeException;
-use Gitonomy\Git\Reference\Stash;
 use Gitonomy\Git\Reference\Branch;
+use Gitonomy\Git\Reference\Stash;
 use Gitonomy\Git\Reference\Tag;
 
 /**

src/Gitonomy/Git/Repository.php

@@ -12,14 +12,13 @@
 
 namespace Gitonomy\Git;
 
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
-
 use Gitonomy\Git\Diff\Diff;
+use Gitonomy\Git\Exception\InvalidArgumentException;
 use Gitonomy\Git\Exception\ProcessException;
 use Gitonomy\Git\Exception\RuntimeException;
-use Gitonomy\Git\Exception\InvalidArgumentException;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Process\Process;
+use Symfony\Component\Process\ProcessBuilder;
 
 /**
  * Git repository object.
@@ -115,7 +114,7 @@ class Repository
      */
     public function __construct($dir, $options = array())
     {
-        $is_windows = defined( 'PHP_WINDOWS_VERSION_BUILD' );
+        $is_windows = defined('PHP_WINDOWS_VERSION_BUILD');
         $options = array_merge(array(
             'working_dir'           => null,
             'debug'                 => true,
@@ -139,7 +138,7 @@ public function __construct($dir, $options = array())
         $this->command              = $options['command'];
 
         if (true === $this->debug && null !== $this->logger) {
-            $this->logger->debug(sprintf('Repository created (git dir: "%s", working dir: "%s")', $this->gitDir, $this->workingDir ? : 'none'));
+            $this->logger->debug(sprintf('Repository created (git dir: "%s", working dir: "%s")', $this->gitDir, $this->workingDir ?: 'none'));
         }
     }
 
@@ -379,7 +378,7 @@ public function getBlame($revision, $file, $lineRange = null)
      *
      * @param array $revisions An array of revisions to show logs from. Can be
      *                         any text value type
-     * @param array $paths Restrict log to modifications occuring on given
+     * @param array $paths     Restrict log to modifications occuring on given
      *                         paths.
      *
      * @param int $offset Start from a given offset in results.
@@ -616,7 +615,7 @@ private function getProcess($command, $args = array())
         $base = array($this->command, '--git-dir', $this->gitDir);
 
         if ($this->workingDir) {
-            $base = array_merge($base, array('--work-tree', $this->workingDir));;
+            $base = array_merge($base, array('--work-tree', $this->workingDir));
         }
 
         $base[] = $command;

src/Gitonomy/Git/Revision.php

@@ -12,10 +12,6 @@
 
 namespace Gitonomy\Git;
 
-use Gitonomy\Git\Exception\ReferenceNotFoundException;
-use Gitonomy\Git\Exception\InvalidArgumentException;
-use Gitonomy\Git\Exception\ProcessException;
-
 /**
  * @author Alexandre Salomé <[email protected]>
  */

src/Gitonomy/Git/RevisionList.php

@@ -12,8 +12,6 @@
 
 namespace Gitonomy\Git;
 
-use Gitonomy\Git\Util\StringHelper;
-
 /**
  * @author Alexandre Salomé <[email protected]>
  */

src/Gitonomy/Git/Tree.php

@@ -12,7 +12,6 @@
 
 namespace Gitonomy\Git;
 
-use Gitonomy\Git\CommitReference;
 use Gitonomy\Git\Exception\InvalidArgumentException;
 use Gitonomy\Git\Exception\UnexpectedValueException;
 

src/Gitonomy/Git/WorkingCopy.php

@@ -13,9 +13,8 @@
 namespace Gitonomy\Git;
 
 use Gitonomy\Git\Diff\Diff;
-
-use Gitonomy\Git\Exception\LogicException;
 use Gitonomy\Git\Exception\InvalidArgumentException;
+use Gitonomy\Git\Exception\LogicException;
 
 /**
  * @author Alexandre Salomé <[email protected]>
@@ -44,8 +43,9 @@ public function getStatus()
     public function getUntrackedFiles()
     {
         $lines = explode("\0", $this->run('status', array('--porcelain', '--untracked-files=all', '-z')));
-        $lines = array_filter($lines, function($l) { return substr($l, 0, 3) === '?? '; });
-        $lines = array_map(function($l) { return substr($l, 3); }, $lines);
+        $lines = array_filter($lines, function ($l) { return substr($l, 0, 3) === '?? '; });
+        $lines = array_map(function ($l) { return substr($l, 3); }, $lines);
+
         return $lines;
     }
 

tests/Gitonomy/Git/Tests/AdminTest.php

@@ -13,8 +13,8 @@
 namespace Gitonomy\Git\Tests;
 
 use Gitonomy\Git\Admin;
-use Gitonomy\Git\Repository;
 use Gitonomy\Git\Reference\Branch;
+use Gitonomy\Git\Repository;
 
 class AdminTest extends AbstractTest
 {

tests/Gitonomy/Git/Tests/CommitTest.php

@@ -204,7 +204,6 @@ public function testGetShortMessage($repository)
         $this->assertEquals('Add README', $commit->getShortMessage(20));
         $this->assertEquals('A', $commit->getShortMessage(1, false, ''));
         $this->assertEquals('Add!!!', $commit->getShortMessage(1, true, '!!!'));
-
     }
 
     /**

tests/Gitonomy/Git/Tests/RepositoryTest.php

@@ -12,8 +12,8 @@
 
 namespace Gitonomy\Git\Tests;
 
-use Gitonomy\Git\Repository;
 use Gitonomy\Git\Blob;
+use Gitonomy\Git\Repository;
 
 class RepositoryTest extends AbstractTest
 {