CS fixes

Author: adamlundrigan

module/ZfModule/src/ZfModule/Controller/IndexController.php

@@ -4,12 +4,12 @@
 
 use Application\Service\RepositoryRetriever;
 use EdpGithub\Collection\RepositoryCollection;
+use EdpGithub\Listener\Exception\RuntimeException as GithubException;
 use Zend\Http;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
 use ZfModule\Mapper;
 use ZfModule\Service;
-use EdpGithub\Listener\Exception\RuntimeException as GithubException;
 
 class IndexController extends AbstractActionController
 {
@@ -94,15 +94,15 @@ public function indexAction()
             'errorMessage' => '',
         ]);
         $viewModel->setTerminal(true);
-        
+
         try {
             $repos = $this->repositoryRetriever->getAuthenticatedUserRepositories($params);
             $repositories = $this->fetchModules($repos);
             $viewModel->setVariable('repositories', $repositories);
         } catch (GithubException $ex) {
             $viewModel->setVariable('errorMessage', $ex->getMessage());
         }
-        
+
         return $viewModel;
     }
 
@@ -119,22 +119,21 @@ public function organizationAction()
             'direction' => 'desc',
         ];
 
-
         $viewModel = new ViewModel([
             'repositories' => [],
             'errorMessage' => '',
         ]);
         $viewModel->setTerminal(true);
         $viewModel->setTemplate('zf-module/index/index.phtml');
-        
+
         try {
             $repos = $this->repositoryRetriever->getUserRepositories($owner, $params);
             $repositories = $this->fetchModules($repos);
             $viewModel->setVariable('repositories', $repositories);
         } catch (GithubException $ex) {
             $viewModel->setVariable('errorMessage', $ex->getMessage());
         }
-        
+
         return $viewModel;
     }
 

module/ZfModule/test/ZfModuleTest/Controller/IndexControllerTest.php

@@ -2,44 +2,44 @@
 
 namespace ZfModuleTest\Controller;
 
-use ZfModule\Controller\IndexController;
-use PHPUnit_Framework_TestCase;
-use ZfModule\Mapper\Module as ModuleMapper;
-use ZfModule\Service\Module as ModuleService;
 use Application\Service\RepositoryRetriever;
-use ZfcUser\Controller\Plugin\ZfcUserAuthentication;
-use EdpGithub\Collection\RepositoryCollection;
 use EdpGithub\Api;
+use EdpGithub\Collection\RepositoryCollection;
 use EdpGithub\Listener\Exception\RuntimeException as EdpGithubRuntimeException;
+use PHPUnit_Framework_TestCase;
 use Zend\Mvc\Router\RouteMatch;
+use ZfcUser\Controller\Plugin\ZfcUserAuthentication;
+use ZfModule\Controller\IndexController;
+use ZfModule\Mapper\Module as ModuleMapper;
+use ZfModule\Service\Module as ModuleService;
 
 class IndexControllerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var IndexController
      */
     protected $controller;
-    
+
     /**
      * @var ModuleMapper
      */
     protected $moduleMapper;
-    
+
     /**
      * @var ModuleService
      */
     protected $moduleService;
-    
+
     /**
      * @var RepositoryRetriever
      */
     protected $repositoryRetriever;
-    
+
     /**
      * @var ZfcUserAuthentication
      */
     protected $zfcUserAuthentication;
-    
+
     public function setUp()
     {
         $this->moduleMapper = $this->getMockBuilder('ZfModule\Mapper\Module')
@@ -53,16 +53,16 @@ public function setUp()
         $this->repositoryRetriever = $this->getMockBuilder('Application\Service\RepositoryRetriever')
                                           ->disableOriginalConstructor()
                                           ->getMock();
-        
+
         $this->controller = new IndexController(
             $this->moduleMapper,
             $this->moduleService,
             $this->repositoryRetriever
         );
-        
+
         $this->zfcUserAuthentication = $this->getMockBuilder('ZfcUser\Controller\Plugin\ZfcUserAuthentication')
                                             ->getMock();
-        
+
         $this->controller->getPluginManager()->setService(
             'zfcUserAuthentication',
             $this->zfcUserAuthentication
@@ -74,93 +74,93 @@ public function testIndexActionReturnsRepositoryListOnSuccessfulSync()
         $this->zfcUserAuthentication->expects($this->once())
                                     ->method('hasIdentity')
                                     ->will($this->returnValue(true));
-        
+
         $githubClient = $this->getClientMock(new Api\Repos(), [
             ['name' => 'foo', 'fork' => false, 'permissions' => ['push' => true]]
         ]);
         $githubResponse = new RepositoryCollection($githubClient->getHttpClient(), '');
-        
+
         $this->repositoryRetriever->expects($this->once())
                                   ->method('getAuthenticatedUserRepositories')
                                   ->will($this->returnValue($githubResponse));
-        
+
         $this->moduleService->expects($this->once())
                             ->method('isModule')
                             ->will($this->returnValue(true));
-        
+
         $viewModel = $this->controller->indexAction();
         $this->assertInstanceOf('Zend\View\Model\ModelInterface', $viewModel);
         $this->assertEmpty($viewModel->errorMessage);
         $this->assertNotEmpty($viewModel->repositories);
     }
-    
+
     public function testIndexActionReturnsErrorMessageWhenRepositoryRetrieverThrowsEdpGithubRuntimeException()
     {
         $this->zfcUserAuthentication->expects($this->once())
                                     ->method('hasIdentity')
                                     ->will($this->returnValue(true));
 
         $exception = new EdpGithubRuntimeException('EdpGithub throws this exception');
-        
+
         $this->repositoryRetriever->expects($this->once())
                                   ->method('getAuthenticatedUserRepositories')
                                   ->will($this->throwException($exception));
-        
+
         $viewModel = $this->controller->indexAction();
         $this->assertInstanceOf('Zend\View\Model\ModelInterface', $viewModel);
         $this->assertEquals($exception->getMessage(), $viewModel->errorMessage);
         $this->assertEmpty($viewModel->repositories);
     }
-    
+
     public function testOrganizationActionReturnsRepositoryListOnSuccessfulSync()
     {
         $this->zfcUserAuthentication->expects($this->once())
                                     ->method('hasIdentity')
                                     ->will($this->returnValue(true));
-        
+
         $routeMatch = new RouteMatch(['owner' => 'zendframework']);
         $this->controller->getEvent()->setRouteMatch($routeMatch);
-        
+
         $githubClient = $this->getClientMock(new Api\Repos(), [
             ['name' => 'foo', 'fork' => false, 'permissions' => ['push' => true]]
         ]);
         $githubResponse = new RepositoryCollection($githubClient->getHttpClient(), '');
-        
+
         $this->repositoryRetriever->expects($this->once())
                                   ->method('getUserRepositories')
                                   ->will($this->returnValue($githubResponse));
-        
+
         $this->moduleService->expects($this->once())
                             ->method('isModule')
                             ->will($this->returnValue(true));
-        
+
         $viewModel = $this->controller->organizationAction();
         $this->assertInstanceOf('Zend\View\Model\ModelInterface', $viewModel);
         $this->assertEmpty($viewModel->errorMessage);
         $this->assertNotEmpty($viewModel->repositories);
     }
-    
+
     public function testOrganizationActionReturnsErrorMessageWhenRepositoryRetrieverThrowsEdpGithubRuntimeException()
     {
         $this->zfcUserAuthentication->expects($this->once())
                                     ->method('hasIdentity')
                                     ->will($this->returnValue(true));
-        
+
         $routeMatch = new RouteMatch(['owner' => 'zendframework']);
         $this->controller->getEvent()->setRouteMatch($routeMatch);
-        
+
         $exception = new EdpGithubRuntimeException('EdpGithub throws this exception');
-        
+
         $this->repositoryRetriever->expects($this->once())
                                   ->method('getUserRepositories')
                                   ->will($this->throwException($exception));
-        
+
         $viewModel = $this->controller->organizationAction();
         $this->assertInstanceOf('Zend\View\Model\ModelInterface', $viewModel);
         $this->assertEquals($exception->getMessage(), $viewModel->errorMessage);
         $this->assertEmpty($viewModel->repositories);
     }
-    
+
     /**
      * @param Api\AbstractApi $apiInstance
      * @param array $payload