luyadev / luya

dev/RepoController.php

Doc Comments +7 added lines

@@ -192,6 +192,10 @@ 
     	return $this->_gitWrapper;
     }
     
+    /**
+     * @param boolean $isFork
+     * @param boolean $exists
+     */
     private function summaryItem($repo, $isFork, $exists)
     {
     	return [$repo, $exists, $isFork];
@@ -202,6 +206,9 @@ 
     	return 'repos' . DIRECTORY_SEPARATOR . $repo;
     }
     
+    /**
+     * @param string|boolean $username
+     */
     private function forkExists($username, $repo)
     {
     	return (new Curl())->get('https://api.github.com/repos/'.$username.'/'.$repo)->isSuccess();

Indentation +37 added lines, -37 removed lines

@@ -31,18 +31,18 @@ 
  */
 class RepoController extends BaseDevCommand
 {
-	const CONFIG_VAR_USERNAME = 'username';
+    const CONFIG_VAR_USERNAME = 'username';
 	
-	const CONFIG_VAR_CLONETYPE = 'cloneType';
+    const CONFIG_VAR_CLONETYPE = 'cloneType';
 	
-	/**
-	 * @var string Default action is actionInit();
-	 */
-	public $defaultAction = 'init';
+    /**
+     * @var string Default action is actionInit();
+     */
+    public $defaultAction = 'init';
 	
-	/**
-	 * @var array The default repos from luyadev
-	 */
+    /**
+     * @var array The default repos from luyadev
+     */
     public $repos = [
         'luya',
         'luya-module-admin',
@@ -166,15 +166,15 @@ 
      */
     public function actionClone($repo = null, $vendor = null)
     {
-    	if (empty($repo)) {
-    		$repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)");
-    	}
+        if (empty($repo)) {
+            $repo = $this->prompt("Enter the name of the repo you like to clone (e.g. luya-module-news)");
+        }
     	
-    	if (empty($vendor)) {
-    		$vendor = $this->prompt("Enter the username/vendor for this repo (e.g. luyadev)");
-    	}
+        if (empty($vendor)) {
+            $vendor = $this->prompt("Enter the username/vendor for this repo (e.g. luyadev)");
+        }
     	
-    	return $this->cloneRepo($repo, $this->getCloneUrlBasedOnType($repo, $vendor), $this->getFilesystemRepoPath($repo), $vendor);
+        return $this->cloneRepo($repo, $this->getCloneUrlBasedOnType($repo, $vendor), $this->getFilesystemRepoPath($repo), $vendor);
     }
     
     private $_gitWrapper;
@@ -184,38 +184,38 @@ 
      */
     protected function getGitWrapper()
     {
-    	if ($this->_gitWrapper === null) {
-    		$this->_gitWrapper = new GitWrapper();
-    		$this->_gitWrapper->setTimeout(300);
-    	}
+        if ($this->_gitWrapper === null) {
+            $this->_gitWrapper = new GitWrapper();
+            $this->_gitWrapper->setTimeout(300);
+        }
     
-    	return $this->_gitWrapper;
+        return $this->_gitWrapper;
     }
     
     private function summaryItem($repo, $isFork, $exists)
     {
-    	return [$repo, $exists, $isFork];
+        return [$repo, $exists, $isFork];
     }
     
     private function getFilesystemRepoPath($repo)
     {
-    	return 'repos' . DIRECTORY_SEPARATOR . $repo;
+        return 'repos' . DIRECTORY_SEPARATOR . $repo;
     }
     
     private function forkExists($username, $repo)
     {
-    	return (new Curl())->get('https://api.github.com/repos/'.$username.'/'.$repo)->isSuccess();
+        return (new Curl())->get('https://api.github.com/repos/'.$username.'/'.$repo)->isSuccess();
     }
     
     private function markdown($text, $paragraph = false)
     {
-    	$parser = new Markdown();
+        $parser = new Markdown();
     
-    	if ($paragraph) {
-    		return $parser->parseParagraph($text);
-    	}
+        if ($paragraph) {
+            return $parser->parseParagraph($text);
+        }
     
-    	return $parser->parse($text);
+        return $parser->parse($text);
     }
     
     /**
@@ -227,7 +227,7 @@ 
      */
     private function getCloneUrlBasedOnType($repo, $username)
     {
-    	return ($this->getConfig(self::CONFIG_VAR_CLONETYPE) == 'ssh') ? "git@github.com:{$username}/{$repo}.git" : "https://github.com/{$username}/{$repo}.git";
+        return ($this->getConfig(self::CONFIG_VAR_CLONETYPE) == 'ssh') ? "git@github.com:{$username}/{$repo}.git" : "https://github.com/{$username}/{$repo}.git";
     }
     
     /**
@@ -240,12 +240,12 @@ 
      */
     private function cloneRepo($repo, $cloneUrl, $newRepoHome, $upstreamUsername)
     {
-    	$this->outputSuccess("{$repo}: cloning ...");
-    	$this->getGitWrapper()->cloneRepository($cloneUrl, $newRepoHome);
-    	if (!empty($upstreamUsername)) {
-    		$this->getGitWrapper()->git('remote add upstream https://github.com/'.$upstreamUsername.'/'.$repo.'.git',  $newRepoHome);
-    		$this->outputInfo("Configure upstream https://github.com/{$upstreamUsername}/{$repo}.git");
-    	}
-    	$this->outputSuccess("{$repo}: ✔ complete");
+        $this->outputSuccess("{$repo}: cloning ...");
+        $this->getGitWrapper()->cloneRepository($cloneUrl, $newRepoHome);
+        if (!empty($upstreamUsername)) {
+            $this->getGitWrapper()->git('remote add upstream https://github.com/'.$upstreamUsername.'/'.$repo.'.git',  $newRepoHome);
+            $this->outputInfo("Configure upstream https://github.com/{$upstreamUsername}/{$repo}.git");
+        }
+        $this->outputSuccess("{$repo}: ✔ complete");
     }
 }

Spacing +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
         // generate summary overview
         foreach ($this->repos as $repo) {
             $newRepoHome = $this->getFilesystemRepoPath($repo);
-            if (file_exists($newRepoHome . DIRECTORY_SEPARATOR . '.git')) {
+            if (file_exists($newRepoHome.DIRECTORY_SEPARATOR.'.git')) {
                 $summary[] = $this->summaryItem($repo, false, true);
             } elseif ($this->forkExists($username, $repo)) {
                 $summary[] = $this->summaryItem($repo, true, false);
@@ -147,13 +147,13 @@ 
         $wrapper = new GitWrapper();
         
         foreach ($this->repos as $repo) {
-            $wrapper->git('checkout master',  'repos' . DIRECTORY_SEPARATOR . $repo);
+            $wrapper->git('checkout master', 'repos'.DIRECTORY_SEPARATOR.$repo);
             $this->outputInfo("{$repo}: checkout master ✔");
             
-            $wrapper->git('fetch upstream',  'repos' . DIRECTORY_SEPARATOR . $repo);
+            $wrapper->git('fetch upstream', 'repos'.DIRECTORY_SEPARATOR.$repo);
             $this->outputInfo("{$repo}: fetch upstream ✔");
             
-            $wrapper->git('rebase upstream/master master',  'repos' . DIRECTORY_SEPARATOR . $repo);
+            $wrapper->git('rebase upstream/master master', 'repos'.DIRECTORY_SEPARATOR.$repo);
             $this->outputInfo("{$repo}: rebase master ✔");
         }
     }
@@ -199,7 +199,7 @@ 
     
     private function getFilesystemRepoPath($repo)
     {
-    	return 'repos' . DIRECTORY_SEPARATOR . $repo;
+    	return 'repos'.DIRECTORY_SEPARATOR.$repo;
     }
     
     private function forkExists($username, $repo)
@@ -243,7 +243,7 @@ 
     	$this->outputSuccess("{$repo}: cloning ...");
     	$this->getGitWrapper()->cloneRepository($cloneUrl, $newRepoHome);
     	if (!empty($upstreamUsername)) {
-    		$this->getGitWrapper()->git('remote add upstream https://github.com/'.$upstreamUsername.'/'.$repo.'.git',  $newRepoHome);
+    		$this->getGitWrapper()->git('remote add upstream https://github.com/'.$upstreamUsername.'/'.$repo.'.git', $newRepoHome);
     		$this->outputInfo("Configure upstream https://github.com/{$upstreamUsername}/{$repo}.git");
     	}
     	$this->outputSuccess("{$repo}: ✔ complete");