*/
-class GitCommitFileCollection implements \Iterator{
-
+class GitCommitFileCollection implements Iterator, Countable
+{
private $gitCommitFiles = [];
-
+
private $index = 0;
-
+
/**
- * Added (A) Count
- * @var integer;
+ * Added (A) Count.
+ *
+ * @var integer;
*/
private $addedCount = 0;
-
+
/**
- * Copied (C), count
- * @var integer
+ * Copied (C), count.
+ *
+ * @var int
*/
private $copiedCount = 0;
-
+
/**
- * Deleted (D), count
- * @var integer
+ * Deleted (D), count.
+ *
+ * @var int
*/
private $deletedCount = 0;
-
+
/**
- * Modified (M), count
- * @var integer
+ * Modified (M), count.
+ *
+ * @var int
*/
private $modifiedCount = 0;
-
+
/**
- * Renamed (R), count
- * @var integer
+ * Renamed (R), count.
+ *
+ * @var int
*/
private $renamedCount = 0;
-
+
/**
* Stores the count of other file type (i.e. regular file, symlink, submodule, …) with status
* changed (T),
- * Unmerged (U),
+ * Unmerged (U),
* Unknown (X),
- * Broken (B)
- * @var integer
+ * Broken (B).
+ *
+ * @var int
*/
private $otherStatusCount = 0;
@@ -72,7 +80,7 @@ public function current()
public function next()
{
- $this->index ++;
+ ++$this->index;
}
public function key()
@@ -90,60 +98,79 @@ public function rewind()
$this->index = 0;
}
- public function reverse()
+ public function reverse(): void
{
$this->gitCommitFiles = array_reverse($this->gitCommitFiles);
$this->rewind();
}
-
-
- public function addGitCommitFile(GitCommitFile $gitCommitFile) {
+
+ public function addGitCommitFile(GitCommitFile $gitCommitFile)
+ {
$this->gitCommitFiles[] = $gitCommitFile;
$this->processStatusCount($gitCommitFile->getStatusChange());
+
return $this;
}
-
- protected function processStatusCount($status){
- if($status === 'A'){
- $this->addedCount++;
- }elseif($status === 'C'){
- $this->copiedCount++;
- }elseif($status === 'D'){
- $this->deletedCount++;
- }elseif($status === 'M'){
- $this->modifiedCount++;
- }elseif($status === 'R'){
- $this->renamedCount++;
- }else{
- $this->otherStatusCount++;
+
+ protected function processStatusCount($status): void
+ {
+ if ($status === 'A') {
+ ++$this->addedCount;
+ } elseif ($status === 'C') {
+ ++$this->copiedCount;
+ } elseif ($status === 'D') {
+ ++$this->deletedCount;
+ } elseif ($status === 'M') {
+ ++$this->modifiedCount;
+ } elseif ($status === 'R') {
+ ++$this->renamedCount;
+ } else {
+ ++$this->otherStatusCount;
}
}
-
- public function getAddedCount() {
+
+ public function getAddedCount(): int
+ {
return $this->addedCount;
}
- public function getCopiedCount() {
+ public function getCopiedCount(): int
+ {
return $this->copiedCount;
}
- public function getDeletedCount() {
+ public function getDeletedCount(): int
+ {
return $this->deletedCount;
}
- public function getModifiedCount() {
+ public function getModifiedCount(): int
+ {
return $this->modifiedCount;
}
- public function getRenamedCount() {
+ public function getRenamedCount(): int
+ {
return $this->renamedCount;
}
- public function getOtherStatusCount() {
+ public function getOtherStatusCount(): int
+ {
return $this->otherStatusCount;
}
-
-
-
-}
\ No newline at end of file
+ /**
+ * Count elements of an object
+ *
+ * @link https://php.net/manual/en/countable.count.php
+ * @return int The custom count as an integer.
+ *
+ *
+ * The return value is cast to an integer.
+ * @since 5.1.0
+ */
+ public function count(): int
+ {
+ return count($this->gitCommitFiles);
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/Entity/FileInfo.php b/app/src/VersionControl/GitCommandBundle/Entity/FileInfo.php
similarity index 55%
rename from src/VersionControl/GitCommandBundle/Entity/FileInfo.php
rename to app/src/VersionControl/GitCommandBundle/Entity/FileInfo.php
index 921131c..7c75b5f 100644
--- a/src/VersionControl/GitCommandBundle/Entity/FileInfo.php
+++ b/app/src/VersionControl/GitCommandBundle/Entity/FileInfo.php
@@ -12,71 +12,88 @@
namespace VersionControl\GitCommandBundle\Entity;
+use SplFileInfo;
+
/**
- * Info on Local file including git log and path.
+ * Info on Local file including git log and path.
*
* @link http://php.net/manual/en/class.splfileinfo.php
+ *
* @author Paul Schweppe
*/
-class FileInfo extends \SplFileInfo{
-
-
+class FileInfo extends SplFileInfo implements FileInfoInterface
+{
/**
- * File full path to file
- * @var string
+ * File full path to file.
+ *
+ * @var string
*/
protected $gitPath;
-
+
/**
- * Git log Entity
- * @var GitLog
+ * Git log Entity.
+ *
+ * @var GitLog
*/
protected $gitLog;
/**
- * Gets the git log for the file
- * @return \VersionControl\GitCommandBundle\Entity\GitLog
+ * Gets the git log for the file.
+ *
+ * @return GitLog
*/
- public function getGitLog() {
+ public function getGitLog()
+ {
return $this->gitLog;
}
/**
- * Sets the git log for the file
- * @param \VersionControl\GitCommandBundle\Entity\GitLog $gitLog
- * @return \VersionControl\GitCommandBundle\Entity\FileInfo
+ * Sets the git log for the file.
+ *
+ * @param GitLog $gitLog
+ *
+ * @return FileInfo
*/
- public function setGitLog(GitLog $gitLog) {
+ public function setGitLog(GitLog $gitLog)
+ {
$this->gitLog = $gitLog;
+
return $this;
- }
-
+ }
+
/**
- * Gets absolute path to file. Wrapper for SplFileInfo::getRealPath
- *
+ * Gets absolute path to file. Wrapper for SplFileInfo::getRealPath.
+ *
* @link http://php.net/manual/en/splfileinfo.getrealpath.php
+ *
* @return string
*/
- public function getFullPath() {
+ public function getFullPath()
+ {
return $this->getRealPath();
}
-
+
/**
- * Gets the file path relative to the .git folder
+ * Gets the file path relative to the .git folder.
+ *
* @return string
*/
- public function getGitPath() {
+ public function getGitPath()
+ {
return $this->gitPath;
}
/**
- * Sets the file path relative to the .git folder
+ * Sets the file path relative to the .git folder.
+ *
* @param string $gitPath
- * @return \VersionControl\GitCommandBundle\Entity\FileInfo
+ *
+ * @return FileInfo
*/
- public function setGitPath($gitPath) {
+ public function setGitPath($gitPath)
+ {
$this->gitPath = $gitPath;
+
return $this;
}
-
}
diff --git a/app/src/VersionControl/GitCommandBundle/Entity/FileInfoInterface.php b/app/src/VersionControl/GitCommandBundle/Entity/FileInfoInterface.php
new file mode 100644
index 0000000..481ec9d
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Entity/FileInfoInterface.php
@@ -0,0 +1,61 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Entity;
+
+/**
+ * Info on Local file including git log and path.
+ *
+ * @link http://php.net/manual/en/class.splfileinfo.php
+ *
+ * @author Paul Schweppe
+ */
+interface FileInfoInterface
+{
+ /*
+ * Get Functions
+ */
+ public function getExtension();
+
+ public function getFilename();
+
+ public function getPath();
+
+ public function getPerms();
+
+ public function getSize();
+
+ public function getATime();
+
+ public function getMTime();
+
+ public function getType();
+
+ public function getFullPath();
+
+ public function getGitPath();
+
+ public function getGitLog();
+
+ /*
+ * Set Functions
+ */
+ public function setGitPath($gitPath);
+
+ public function setGitLog(GitLog $gitLog);
+
+ public function isDir();
+
+ public function isFile();
+
+ public function isLink();
+}
diff --git a/src/VersionControl/GitCommandBundle/Entity/GitCommitFile.php b/app/src/VersionControl/GitCommandBundle/Entity/GitCommitFile.php
similarity index 69%
rename from src/VersionControl/GitCommandBundle/Entity/GitCommitFile.php
rename to app/src/VersionControl/GitCommandBundle/Entity/GitCommitFile.php
index 973feb6..9fd3927 100644
--- a/src/VersionControl/GitCommandBundle/Entity/GitCommitFile.php
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitCommitFile.php
@@ -12,90 +12,96 @@
namespace VersionControl\GitCommandBundle\Entity;
-
/**
* Entity containing the file name and status
- * for a commit
+ * for a commit.
*
* @author Paul Schweppe
*/
class GitCommitFile
{
/**
- * The file Path
+ * The file Path.
+ *
* @var string
*/
protected $filePath;
-
+
/*
* Single character repersenting the files status in commit;
* Possible values are: A|C|D|M|R|T|U|X|B
- *
+ *
* Added (A),
* Copied (C),
* Deleted (D),
* Modified (M),
* Renamed (R),
- * have their type (i.e. regular file, symlink, submodule, …)
+ * have their type (i.e. regular file, symlink, submodule, …)
* changed (T),
- * Unmerged (U),
+ * Unmerged (U),
* Unknown (X),
* Broken (B)
- *
- * @var string
+ *
+ * @var string
*/
protected $statusChange;
-
+
/**
- * The Original line
- * @var string
+ * The Original line.
+ *
+ * @var string
*/
protected $line;
-
+
/**
* Excepts a line in the format:
- * Status File name
- * M typo3conf/ext/fr_mapfeusertoasti/log/log.txt
+ * Status File name
+ * M typo3conf/ext/fr_mapfeusertoasti/log/log.txt.
*
+ * @param $line
*/
- public function __construct($line){
+ public function __construct($line)
+ {
$this->line = $line;
-
- $this->statusChange = substr($line, 0 ,1);
-
- $this->filePath = trim(substr($line, 1));
+ $this->statusChange = $line[0];
+
+ $this->filePath = trim(substr($line, 1));
}
- public function getFilePath() {
+ public function getFilePath(): string
+ {
return $this->filePath;
}
- public function getStatusChange() {
+ public function getStatusChange()
+ {
return $this->statusChange;
}
- public function getLine() {
+ public function getLine(): string
+ {
return $this->line;
}
- public function setFilePath(type $filePath) {
+ public function setFilePath($filePath)
+ {
$this->filePath = $filePath;
+
return $this;
}
- public function setStatusChange($statusChange) {
+ public function setStatusChange($statusChange)
+ {
$this->statusChange = $statusChange;
+
return $this;
}
- public function setLine($line) {
+ public function setLine($line)
+ {
$this->line = $line;
+
return $this;
}
-
-
-
-
}
-
diff --git a/app/src/VersionControl/GitCommandBundle/Entity/GitDiff.php b/app/src/VersionControl/GitCommandBundle/Entity/GitDiff.php
new file mode 100644
index 0000000..f3f73fb
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitDiff.php
@@ -0,0 +1,157 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Entity;
+
+/**
+ * Git Diff Entity.
+ *
+ * @author Paul Schweppe
+ */
+class GitDiff
+{
+ public const NEWFILE = 'new';
+ public const DELETDFILE = 'deleted';
+ public const MODIFIEDFILE = 'modified';
+
+ /**
+ * File before commit eg From File.
+ *
+ * @var string
+ */
+ protected $fileA;
+
+ /**
+ * File after commit eg To file.
+ *
+ * @var string
+ */
+ protected $fileB;
+
+ /**
+ * Lines in Commit.
+ *
+ * @var array of GitDiffLines
+ */
+ protected $diffLines;
+
+ public function __construct()
+ {
+ }
+
+ /**
+ * Get file from path.
+ *
+ * @return string
+ */
+ public function getFileA(): string
+ {
+ return $this->fileA;
+ }
+
+ /**
+ * Set file to.
+ *
+ * @param string $fileA
+ *
+ * @return GitDiff
+ */
+ public function setFileA($fileA): GitDiff
+ {
+ $this->fileA = $fileA;
+
+ return $this;
+ }
+
+ /**
+ * Get file to path.
+ *
+ * @return string
+ */
+ public function getFileB(): string
+ {
+ return $this->fileB;
+ }
+
+ /**
+ * Set file From.
+ *
+ * @param string $fileB
+ *
+ * @return GitDiff
+ */
+ public function setFileB($fileB): GitDiff
+ {
+ $this->fileB = $fileB;
+
+ return $this;
+ }
+
+ /**
+ * Gets array of Git Diff lines.
+ *
+ * @return array Of GitDiffLines
+ */
+ public function getDiffLines(): array
+ {
+ return $this->diffLines;
+ }
+
+ /**
+ * Sets git diff lines.
+ *
+ * @param array $diffLines
+ *
+ * @return GitDiff
+ */
+ public function setDiffLines($diffLines): GitDiff
+ {
+ $this->diffLines = $diffLines;
+
+ return $this;
+ }
+
+ /**
+ * Gets the diff file name based on file a and b
+ * Removes a/ or b/ from start of file path.
+ *
+ * @return string files path
+ */
+ public function getFileName(): string
+ {
+ if ($this->fileA === '/dev/null') {
+ $file = $this->fileB;
+ } else {
+ $file = $this->fileA;
+ }
+
+ return substr($file, 2);
+ }
+
+ /**
+ * Gets the status of the diff eg new, deleted or modified.
+ *
+ * @return string constant
+ */
+ public function getStatus(): string
+ {
+ if ($this->fileA === '/dev/null') {
+ $status = self::NEWFILE;
+ } elseif ($this->fileB === '/dev/null') {
+ $status = self::DELETDFILE;
+ } else {
+ $status = self::MODIFIEDFILE;
+ }
+
+ return $status;
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Entity/GitDiffLine.php b/app/src/VersionControl/GitCommandBundle/Entity/GitDiffLine.php
new file mode 100644
index 0000000..55f01d7
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitDiffLine.php
@@ -0,0 +1,127 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Entity;
+
+/**
+ * Git Diff Line:.
+ *
+ * @author Paul Schweppe
+ */
+class GitDiffLine
+{
+ public const NOCHANGE = 0;
+ public const ADDED = 1;
+ public const REMOVED = 2;
+
+ /**
+ * @var int
+ */
+ protected $type;
+
+ /**
+ * The line content.
+ *
+ * @var string
+ */
+ protected $line;
+
+ /**
+ * The line number. Can be a number or string eg '...'.
+ *
+ * @var string
+ */
+ protected $lineNumber;
+
+ /**
+ * Sets line and line type.
+ *
+ * @param string $line The line content
+ */
+ public function __construct($line)
+ {
+ $this->line = $line;
+
+ $firstCharacter = $line[0] ?? '';
+
+ if ($firstCharacter !== false) {
+ if ($firstCharacter === '+') {
+ $this->type = self::ADDED;
+ // $type = Line::ADDED;
+ } elseif ($firstCharacter === '-') {
+ $this->type = self::REMOVED;
+ } else {
+ $this->type = self::NOCHANGE;
+ }
+ } else {
+ $this->type = self::NOCHANGE;
+ }
+ }
+
+ /**
+ * Get Line type.
+ *
+ * @return int
+ */
+ public function getType(): int
+ {
+ return $this->type;
+ }
+
+ /**
+ * Sets line type.
+ *
+ * @param int $type
+ *
+ * @return GitDiffLine
+ */
+ public function setType($type): GitDiffLine
+ {
+ $this->type = $type;
+
+ return $this;
+ }
+
+ /**
+ * Gets line content.
+ *
+ * @return string
+ */
+ public function getLine(): string
+ {
+ return $this->line;
+ }
+
+ /**
+ * Gets line number. This can be a string.
+ *
+ * @return string
+ */
+ public function getLineNumber(): string
+ {
+ return $this->lineNumber;
+ }
+
+ /**
+ * Sets line content.
+ *
+ * @param string $lineNumber
+ *
+ * @return GitDiffLine
+ */
+ public function setLineNumber($lineNumber): GitDiffLine
+ {
+ $this->lineNumber = $lineNumber;
+
+ return $this;
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Entity/GitFile.php b/app/src/VersionControl/GitCommandBundle/Entity/GitFile.php
new file mode 100644
index 0000000..6189acb
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitFile.php
@@ -0,0 +1,149 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Entity;
+
+/**
+ * In the short-format, the status of each path is shown as
+ * XY PATH1 -> PATH2
+ * where PATH1 is the path in the HEAD, and the ` -> PATH2` part is shown only when PATH1 corresponds to a different
+ * path in the index/worktree (i.e. the file is renamed). The XY is a two-letter status code.
+ *
+ * The fields (including the ->) are separated from each other by a single space. If a filename contains whitespace or
+ * other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII
+ * double quote (34) characters, and with interior special characters backslash-escaped.
+ * For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that do
+ * not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For untracked
+ * paths, XY are ??. Other status codes can be interpreted as follows:
+ * ' ' = unmodified
+ * M = modified
+ * A = added
+ * D = deleted
+ * R = renamed
+ * C = copied
+ * U = updated but unmerged
+ *
+ * Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.
+ *
+ * X Y Meaning
+ * -------------------------------------------------
+ * [MD] not updated
+ * M [ MD] updated in index
+ * A [ MD] added to index
+ * D [ M] deleted from index
+ * R [ MD] renamed in index
+ * C [ MD] copied in index
+ * [MARC] index and work tree matches
+ * [ MARC] M work tree changed since index
+ * [ MARC] D deleted in work tree
+ * -------------------------------------------------
+ * D D unmerged, both deleted
+ * A U unmerged, added by us
+ * U D unmerged, deleted by them
+ * U A unmerged, added by them
+ * D U unmerged, deleted by us
+ * A A unmerged, both added
+ * U U unmerged, both modified
+ * -------------------------------------------------
+ * ? ? untracked
+ * ! ! ignored
+ * -------------------------------------------------
+ * If -b is used the short-format status is preceded by a line
+ *
+ * @author Paul Schweppe
+ */
+class GitFile
+{
+ protected $id;
+
+ protected $fileType;
+
+ protected $indexStatus;
+
+ protected $workTreeStatus;
+
+ protected $path1;
+
+ protected $path2;
+
+ protected $line;
+
+ protected $gitPath;
+
+ public function __construct($line, $gitPath)
+ {
+ $this->line = $line;
+ $this->gitPath = $gitPath;
+
+ $path = substr(rtrim($line), 3);
+ $paths = explode(' -> ', $path);
+ if (count($paths) === 2) {
+ $this->path1 = $paths[0];
+ $this->path2 = $paths[1];
+ } else {
+ $this->path1 = $paths[0];
+ }
+
+ $this->indexStatus = $line[0];
+ $this->workTreeStatus = $line[1];
+ }
+
+ public function getFileType()
+ {
+ return $this->fileType;
+ }
+
+ public function getIndexStatus()
+ {
+ return $this->indexStatus;
+ }
+
+ public function getWorkTreeStatus()
+ {
+ return $this->workTreeStatus;
+ }
+
+ public function getPath1()
+ {
+ return $this->path1;
+ }
+
+ public function getPath2()
+ {
+ return $this->path2;
+ }
+
+ public function setFileType($fileType): void
+ {
+ $this->fileType = $fileType;
+ }
+
+ public function setIndexStatus($indexStatus): void
+ {
+ $this->indexStatus = $indexStatus;
+ }
+
+ public function setWorkTreeStatus($workTreeStatus): void
+ {
+ $this->workTreeStatus = $workTreeStatus;
+ }
+
+ public function setPath1($path1): void
+ {
+ $this->path1 = $path1;
+ }
+
+ public function setPath2($path2): void
+ {
+ $this->path2 = $path2;
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/Entity/GitLog.php b/app/src/VersionControl/GitCommandBundle/Entity/GitLog.php
similarity index 59%
rename from src/VersionControl/GitCommandBundle/Entity/GitLog.php
rename to app/src/VersionControl/GitCommandBundle/Entity/GitLog.php
index cd6507d..d08a669 100644
--- a/src/VersionControl/GitCommandBundle/Entity/GitLog.php
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitLog.php
@@ -1,308 +1,368 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Entity;
-
-
-
-/**
- * Useful options for git log --pretty=format Option Description of Output
- *
- * %H Commit hash
- * %h Abbreviated commit hash
- * %T Tree hash
- * %t Abbreviated tree hash
- * %P Parent hashes
- * %p Abbreviated parent hashes
- * %an Author name
- * %ae Author e-mail
- * %ad Author date (format respects the --date=option)
- * %ar Author date, relative
- * %cn Committer name
- * %ce Committer email
- * %cd Committer date
- * %cr Committer date, relative
- * %s Subject
- *
- * You may be wondering what the difference is between author and committer. The author is the person who originally wrote the work,
- * whereas the committer is the person who last applied the work. So, if you send in a patch to a project and one of the core members
- * applies the patch, both of you get credit – you as the author, and the core member as the committer.
- *
- * @author Paul Schweppe
- */
-class GitLog
-{
- /**
- * Commit hash
- * @var string
- */
- protected $hash;
-
- /**
- * Abbreviated commit hash
- * @var string
- */
- protected $abbrHash;
-
- /**
- * Tree hash
- * @var string
- */
- protected $treeHash;
-
- /**
- * Abbreviated tree hash
- * @var string
- */
- protected $abbrTreeHash;
-
- /**
- * Parent hashes
- * @var string
- */
- protected $parentHashes;
-
- /**
- * Abbreviated parent hashes
- * @var string
- */
- protected $abbrParentHashes;
-
- /**
- * Author name
- * @var string
- */
- protected $authorName;
-
- /**
- * Author e-mail
- * @var string
- */
- protected $authorEmail;
-
- /**
- * Author date (format respects the --date=option)
- * @var string
- */
- protected $authorDate;
-
- /**
- * Author date, relative
- * @var string
- */
- protected $authorRelative;
-
- /**
- * Committer name
- * @var string
- */
- protected $committerName;
-
- /**
- * Committer email
- * @var string
- */
- protected $committerEmail;
-
- /**
- * Committer date
- * @var string
- */
- protected $committerDate;
-
- /**
- * Committer date, relative
- * @var string
- */
- protected $committerDateRelative;
-
- /**
- * Subject
- * @var string
- */
- protected $subject;
-
- /**
- * File name. Used only on single log entires
- * @var string
- */
- protected $fileName;
-
- public function __construct($line){
- $logData = explode('|',$line);
- if(count($logData) >= 15){
- $this->setHash(trim($logData[0]));
- $this->setAbbrHash(trim($logData[1]));
- $this->setTreeHash(trim($logData[2]));
- $this->setAbbrTreeHash(trim($logData[3]));
- $this->setParentHashes(trim($logData[4]));
- $this->setAbbrParentHashes(trim($logData[5]));
- $this->setAuthorName(trim($logData[6]));
- $this->setAuthorEmail(trim($logData[7]));
- $this->setAuthorDate(trim($logData[8]));
- $this->setAuthorRelative(trim($logData[9]));
- $this->setCommitterName(trim($logData[10]));
- $this->setCommitterEmail(trim($logData[11]));
- $this->setCommitterDate(trim($logData[12]));
- $this->setCommitterDateRelative(trim($logData[13]));
- $this->setSubject(trim($logData[14]));
- }
- }
-
- public function getHash() {
- return $this->hash;
- }
-
- public function getAbbrHash() {
- return $this->abbrHash;
- }
-
- public function getTreeHash() {
- return $this->treeHash;
- }
-
- public function getAbbrTreeHash() {
- return $this->abbrTreeHash;
- }
-
- public function getParentHashes() {
- return $this->parentHashes;
- }
-
- public function getAbbrParentHashes() {
- return $this->abbrParentHashes;
- }
-
- public function getAuthorName() {
- return $this->authorName;
- }
-
- public function getAuthorEmail() {
- return $this->authorEmail;
- }
-
- public function getAuthorDate() {
- return $this->authorDate;
- }
-
- public function getAuthorRelative() {
- return $this->authorRelative;
- }
-
- public function getCommitterName() {
- return $this->committerName;
- }
-
- public function getCommitterEmail() {
- return $this->committerEmail;
- }
-
- public function getCommitterDate() {
- return $this->committerDate;
- }
-
- public function getCommitterDateRelative() {
- return $this->committerDateRelative;
- }
-
- public function getSubject() {
- return $this->subject;
- }
-
- public function setHash($hash) {
- $this->hash = $hash;
- return $this;
- }
-
- public function setAbbrHash($abbrHash) {
- $this->abbrHash = $abbrHash;
- return $this;
- }
-
- public function setTreeHash($treeHash) {
- $this->treeHash = $treeHash;
- return $this;
- }
-
- public function setAbbrTreeHash($abbrTreeHash) {
- $this->abbrTreeHash = $abbrTreeHash;
- return $this;
- }
-
- public function setParentHashes($parentHashes) {
- $this->parentHashes = $parentHashes;
- return $this;
- }
-
- public function setAbbrParentHashes($abbrParentHashes) {
- $this->abbrParentHashes = $abbrParentHashes;
- return $this;
- }
-
- public function setAuthorName($authorName) {
- $this->authorName = $authorName;
- return $this;
- }
-
- public function setAuthorEmail($authorEmail) {
- $this->authorEmail = $authorEmail;
- return $this;
- }
-
- public function setAuthorDate($authorDate) {
- $this->authorDate = $authorDate;
- return $this;
- }
-
- public function setAuthorRelative($authorRelative) {
- $this->authorRelative = $authorRelative;
- return $this;
- }
-
- public function setCommitterName($committerName) {
- $this->committerName = $committerName;
- return $this;
- }
-
- public function setCommitterEmail($committerEmail) {
- $this->committerEmail = $committerEmail;
- return $this;
- }
-
- public function setCommitterDate($committerDate) {
- $this->committerDate = $committerDate;
- return $this;
- }
-
- public function setCommitterDateRelative($committerDateRelative) {
- $this->committerDateRelative = $committerDateRelative;
- return $this;
- }
-
- public function setSubject($subject) {
- $this->subject = $subject;
- return $this;
- }
-
- public function getFileName() {
- return $this->fileName;
- }
-
- public function setFileName($fileName) {
- $this->fileName = $fileName;
- return $this;
- }
-
-
-
-
-}
-
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Entity;
+
+/**
+ * Useful options for git log --pretty=format Option Description of Output.
+ *
+ * %H Commit hash
+ * %h Abbreviated commit hash
+ * %T Tree hash
+ * %t Abbreviated tree hash
+ * %P Parent hashes
+ * %p Abbreviated parent hashes
+ * %an Author name
+ * %ae Author e-mail
+ * %ad Author date (format respects the --date=option)
+ * %ar Author date, relative
+ * %cn Committer name
+ * %ce Committer email
+ * %cd Committer date
+ * %cr Committer date, relative
+ * %s Subject
+ *
+ * You may be wondering what the difference is between author and committer. The author is the person who originally
+ * wrote the work, whereas the committer is the person who last applied the work. So, if you send in a patch to a
+ * project and one of the core members
+ * applies the patch, both of you get credit – you as the author, and the core member as the committer.
+ *
+ * @author Paul Schweppe
+ */
+class GitLog
+{
+ /**
+ * Commit hash.
+ *
+ * @var string
+ */
+ protected $hash;
+
+ /**
+ * Abbreviated commit hash.
+ *
+ * @var string
+ */
+ protected $abbrHash;
+
+ /**
+ * Tree hash.
+ *
+ * @var string
+ */
+ protected $treeHash;
+
+ /**
+ * Abbreviated tree hash.
+ *
+ * @var string
+ */
+ protected $abbrTreeHash;
+
+ /**
+ * Parent hashes.
+ *
+ * @var string
+ */
+ protected $parentHashes;
+
+ /**
+ * Abbreviated parent hashes.
+ *
+ * @var string
+ */
+ protected $abbrParentHashes;
+
+ /**
+ * Author name.
+ *
+ * @var string
+ */
+ protected $authorName;
+
+ /**
+ * Author e-mail.
+ *
+ * @var string
+ */
+ protected $authorEmail;
+
+ /**
+ * Author date (format respects the --date=option).
+ *
+ * @var string
+ */
+ protected $authorDate;
+
+ /**
+ * Author date, relative.
+ *
+ * @var string
+ */
+ protected $authorRelative;
+
+ /**
+ * Committer name.
+ *
+ * @var string
+ */
+ protected $committerName;
+
+ /**
+ * Committer email.
+ *
+ * @var string
+ */
+ protected $committerEmail;
+
+ /**
+ * Committer date.
+ *
+ * @var string
+ */
+ protected $committerDate;
+
+ /**
+ * Committer date, relative.
+ *
+ * @var string
+ */
+ protected $committerDateRelative;
+
+ /**
+ * Subject.
+ *
+ * @var string
+ */
+ protected $subject;
+
+ /**
+ * File name. Used only on single log entires.
+ *
+ * @var string
+ */
+ protected $fileName;
+
+ public function __construct($line)
+ {
+ $logData = explode('|', $line);
+ if (count($logData) >= 15) {
+ $this->setHash(trim($logData[0]));
+ $this->setAbbrHash(trim($logData[1]));
+ $this->setTreeHash(trim($logData[2]));
+ $this->setAbbrTreeHash(trim($logData[3]));
+ $this->setParentHashes(trim($logData[4]));
+ $this->setAbbrParentHashes(trim($logData[5]));
+ $this->setAuthorName(trim($logData[6]));
+ $this->setAuthorEmail(trim($logData[7]));
+ $this->setAuthorDate(trim($logData[8]));
+ $this->setAuthorRelative(trim($logData[9]));
+ $this->setCommitterName(trim($logData[10]));
+ $this->setCommitterEmail(trim($logData[11]));
+ $this->setCommitterDate(trim($logData[12]));
+ $this->setCommitterDateRelative(trim($logData[13]));
+ $this->setSubject(trim($logData[14]));
+ }
+ }
+
+ public function getHash(): string
+ {
+ return $this->hash;
+ }
+
+ public function getAbbrHash(): string
+ {
+ return $this->abbrHash;
+ }
+
+ public function getTreeHash(): string
+ {
+ return $this->treeHash;
+ }
+
+ public function getAbbrTreeHash(): string
+ {
+ return $this->abbrTreeHash;
+ }
+
+ public function getParentHashes(): string
+ {
+ return $this->parentHashes;
+ }
+
+ public function getAbbrParentHashes(): string
+ {
+ return $this->abbrParentHashes;
+ }
+
+ public function getAuthorName(): string
+ {
+ return $this->authorName;
+ }
+
+ public function getAuthorEmail(): string
+ {
+ return $this->authorEmail;
+ }
+
+ public function getAuthorDate(): string
+ {
+ return $this->authorDate;
+ }
+
+ public function getAuthorRelative(): string
+ {
+ return $this->authorRelative;
+ }
+
+ public function getCommitterName(): string
+ {
+ return $this->committerName;
+ }
+
+ public function getCommitterEmail(): string
+ {
+ return $this->committerEmail;
+ }
+
+ public function getCommitterDate(): string
+ {
+ return $this->committerDate;
+ }
+
+ public function getCommitterDateRelative(): string
+ {
+ return $this->committerDateRelative;
+ }
+
+ public function getSubject(): string
+ {
+ return $this->subject;
+ }
+
+ public function setHash($hash)
+ {
+ $this->hash = $hash;
+
+ return $this;
+ }
+
+ public function setAbbrHash($abbrHash)
+ {
+ $this->abbrHash = $abbrHash;
+
+ return $this;
+ }
+
+ public function setTreeHash($treeHash)
+ {
+ $this->treeHash = $treeHash;
+
+ return $this;
+ }
+
+ public function setAbbrTreeHash($abbrTreeHash)
+ {
+ $this->abbrTreeHash = $abbrTreeHash;
+
+ return $this;
+ }
+
+ public function setParentHashes($parentHashes)
+ {
+ $this->parentHashes = $parentHashes;
+
+ return $this;
+ }
+
+ public function setAbbrParentHashes($abbrParentHashes)
+ {
+ $this->abbrParentHashes = $abbrParentHashes;
+
+ return $this;
+ }
+
+ public function setAuthorName($authorName)
+ {
+ $this->authorName = $authorName;
+
+ return $this;
+ }
+
+ public function setAuthorEmail($authorEmail)
+ {
+ $this->authorEmail = $authorEmail;
+
+ return $this;
+ }
+
+ public function setAuthorDate($authorDate)
+ {
+ $this->authorDate = $authorDate;
+
+ return $this;
+ }
+
+ public function setAuthorRelative($authorRelative)
+ {
+ $this->authorRelative = $authorRelative;
+
+ return $this;
+ }
+
+ public function setCommitterName($committerName)
+ {
+ $this->committerName = $committerName;
+
+ return $this;
+ }
+
+ public function setCommitterEmail($committerEmail)
+ {
+ $this->committerEmail = $committerEmail;
+
+ return $this;
+ }
+
+ public function setCommitterDate($committerDate)
+ {
+ $this->committerDate = $committerDate;
+
+ return $this;
+ }
+
+ public function setCommitterDateRelative($committerDateRelative)
+ {
+ $this->committerDateRelative = $committerDateRelative;
+
+ return $this;
+ }
+
+ public function setSubject($subject)
+ {
+ $this->subject = $subject;
+
+ return $this;
+ }
+
+ public function getFileName(): string
+ {
+ return $this->fileName;
+ }
+
+ public function setFileName($fileName)
+ {
+ $this->fileName = $fileName;
+
+ return $this;
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/Entity/GitRemote.php b/app/src/VersionControl/GitCommandBundle/Entity/GitRemote.php
similarity index 71%
rename from src/VersionControl/GitCommandBundle/Entity/GitRemote.php
rename to app/src/VersionControl/GitCommandBundle/Entity/GitRemote.php
index fd3c498..a3f8418 100644
--- a/src/VersionControl/GitCommandBundle/Entity/GitRemote.php
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitRemote.php
@@ -9,48 +9,55 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitCommandBundle\Entity;
+namespace VersionControl\GitCommandBundle\Entity;
/**
- * Git Remote Respository Entity
+ * Git Remote Respository Entity.
*
* @author Paul Schweppe
*/
-class GitRemote {
-
+class GitRemote
+{
protected $shortName;
-
+
protected $longName;
-
+
protected $state;
-
- public function getShortName() {
+
+ public function getShortName()
+ {
return $this->shortName;
}
- public function getLongName() {
+ public function getLongName()
+ {
return $this->longName;
}
- public function getState() {
+ public function getState()
+ {
return $this->state;
}
- public function setShortName($shortName) {
+ public function setShortName($shortName)
+ {
$this->shortName = $shortName;
+
return $this;
}
- public function setLongName($longName) {
+ public function setLongName($longName)
+ {
$this->longName = $longName;
+
return $this;
}
- public function setState($state) {
+ public function setState($state)
+ {
$this->state = $state;
+
return $this;
}
-
-
-}
\ No newline at end of file
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Entity/GitTag.php b/app/src/VersionControl/GitCommandBundle/Entity/GitTag.php
new file mode 100644
index 0000000..99a88b8
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Entity/GitTag.php
@@ -0,0 +1,170 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Entity;
+
+use DateTime;
+
+/**
+ * Remote File Info.
+ *
+ * "git
+ * for-each-ref
+ * --format
+ * '%(refname:short)|%(subject)|%(taggerDate)|%(taggerName)|%(taggerEmail)|%(*objectname)|%(*objectname:short)'
+ * refs/tags
+ * --sort=taggerDate";
+ *
+ * @author Paul Schweppe
+ */
+class GitTag
+{
+ /**
+ * Tag name.
+ *
+ * @var string
+ */
+ protected $name;
+
+ /**
+ * Tags subject.
+ *
+ * @var string
+ */
+ protected $subject;
+
+ /**
+ * Tag date.
+ *
+ * @var DateTime
+ */
+ protected $taggerDate;
+
+ /**
+ * Taggers name.
+ *
+ * @var string
+ */
+ protected $taggerName;
+
+ /**
+ * Taggers email.
+ *
+ * @var string
+ */
+ protected $taggerEmail;
+
+ /**
+ * Commit hash tag points to.
+ *
+ * @var string
+ */
+ protected $commitHash;
+
+ /**
+ * Abbreviated commit hash that tag points to.
+ *
+ * @var string
+ */
+ protected $commitAbbrHash;
+
+ public function __construct($line)
+ {
+ $data = explode('|', $line);
+ if (count($data) >= 7) {
+ $this->setName($data[0]);
+ $this->setSubject($data[1]);
+ $this->setTaggerDate(new DateTime($data[2]));
+ $this->setTaggerName($data[3]);
+ $this->setTaggerEmail($data[4]);
+ $this->setCommitHash($data[5]);
+ $this->setCommitAbbrHash($data[6]);
+ }
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ public function getTaggerDate(): DateTime
+ {
+ return $this->taggerDate;
+ }
+
+ public function getSubject(): string
+ {
+ return $this->subject;
+ }
+
+ public function getTaggerName(): string
+ {
+ return $this->taggerName;
+ }
+
+ public function getTaggerEmail(): string
+ {
+ return $this->taggerEmail;
+ }
+
+ public function getCommitHash(): string
+ {
+ return $this->commitHash;
+ }
+
+ public function getCommitAbbrHash(): string
+ {
+ return $this->commitAbbrHash;
+ }
+
+ public function setName($name)
+ {
+ $this->name = $name;
+ return $this;
+ }
+
+ public function setTaggerDate(DateTime $taggerDate)
+ {
+ $this->taggerDate = $taggerDate;
+ return $this;
+ }
+
+ public function setSubject($subject)
+ {
+ $this->subject = $subject;
+ return $this;
+ }
+
+ public function setTaggerName($taggerName)
+ {
+ $this->taggerName = $taggerName;
+ return $this;
+ }
+
+ public function setTaggerEmail($taggerEmail)
+ {
+ $this->taggerEmail = $taggerEmail;
+ return $this;
+ }
+
+ public function setCommitHash($commitHash)
+ {
+ $this->commitHash = $commitHash;
+ return $this;
+ }
+
+ public function setCommitAbbrHash($commitAbbrHash)
+ {
+ $this->commitAbbrHash = $commitAbbrHash;
+ return $this;
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php b/app/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php
similarity index 57%
rename from src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php
rename to app/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php
index 85a2a8f..b2f024a 100644
--- a/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php
+++ b/app/src/VersionControl/GitCommandBundle/Entity/RemoteFileInfo.php
@@ -9,81 +9,93 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitCommandBundle\Entity;
+namespace VersionControl\GitCommandBundle\Entity;
/**
- * Remote File Info
+ * Remote File Info.
*
* @author Paul Schweppe
*/
-class RemoteFileInfo{
-
+class RemoteFileInfo implements FileInfoInterface
+{
/**
- * Absolute path to file
- * @var string
+ * Absolute path to file.
+ *
+ * @var string
*/
protected $fullPath;
-
+
/**
- * File Extension
- * @var string
+ * File Extension.
+ *
+ * @var string
*/
protected $extension;
-
+
/**
- * File name without any path information
- * @var string
+ * File name without any path information.
+ *
+ * @var string
*/
protected $filename;
-
+
/**
- * Path without the filename
- * @var string
+ * Path without the filename.
+ *
+ * @var string
*/
protected $path;
-
+
/**
- * File permissions
- * @var string
+ * File permissions.
+ *
+ * @var string
*/
protected $perms;
-
+
/**
- * Filesize in bytes
- * @var integer
+ * Filesize in bytes.
+ *
+ * @var int
*/
protected $size;
-
+
/**
- *
- * @var type
+ * @var integer
*/
protected $uid;
+
protected $gid;
+
protected $mode;
+
protected $aTime;
+
protected $mTime;
+
protected $type;
+
protected $fileTypes;
-
+
protected $gitPath;
-
/**
- * Git log Entity
- * @var GitLog
+ * Git log Entity.
+ *
+ * @var GitLog
*/
protected $gitLog;
- public function __construct($fileData){
- foreach($fileData as $key => $value){
- $setMethod = 'set'.ucfirst($key);
- if(method_exists($this,$setMethod)){
- call_user_func_array(array($this, $setMethod),array($value));
+ public function __construct($fileData)
+ {
+ foreach ($fileData as $key => $value) {
+ $setMethod = 'set' . ucfirst($key);
+ if (method_exists($this, $setMethod)) {
+ $this->$setMethod($value);
}
}
-
+
$this->fileTypes = array(
1 => 'NET_SFTP_TYPE_REGULAR',
2 => 'NET_SFTP_TYPE_DIRECTORY',
@@ -95,159 +107,202 @@ public function __construct($fileData){
6 => 'NET_SFTP_TYPE_SOCKET',
7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
- 9 => 'NET_SFTP_TYPE_FIFO'
+ 9 => 'NET_SFTP_TYPE_FIFO',
);
}
- public function getFullPath() {
+ public function getFullPath()
+ {
return $this->fullPath;
}
- public function getExtension() {
+ public function getExtension()
+ {
return $this->extension;
}
- public function getFilename() {
+ public function getFilename()
+ {
return $this->filename;
}
- public function getPath() {
+ public function getPath()
+ {
return $this->path;
}
- public function getPerms() {
+ public function getPerms()
+ {
return $this->perms;
}
- public function getSize() {
+ public function getSize()
+ {
return $this->size;
}
- public function getUid() {
+ public function getUid(): int
+ {
return $this->uid;
}
- public function getGid() {
+ public function getGid()
+ {
return $this->gid;
}
- public function getMode() {
+ public function getMode()
+ {
return $this->mode;
}
- public function getATime() {
+ public function getATime()
+ {
return $this->aTime;
}
- public function getMTime() {
+ public function getMTime()
+ {
return $this->mTime;
}
- public function getType() {
+ public function getType()
+ {
return $this->type;
}
- public function setFullPath($fullPath) {
+ public function setFullPath($fullPath)
+ {
$this->fullPath = $fullPath;
+
return $this;
}
- public function setExtension($extension) {
+ public function setExtension($extension)
+ {
$this->extension = $extension;
+
return $this;
}
- public function setFilename($filename) {
+ public function setFilename($filename)
+ {
$this->filename = $filename;
$pathParts = pathinfo($filename);
- if(key_exists('extension', $pathParts)){
+ if (array_key_exists('extension', $pathParts)) {
$this->setExtension($pathParts['extension']);
}
-
+
return $this;
}
- public function setPath($path) {
+ public function setPath($path)
+ {
$this->path = $path;
+
return $this;
}
- public function setPerms($perms) {
+ public function setPerms($perms)
+ {
$this->perms = $perms;
+
return $this;
}
-
- public function setPermissions($perms) {
+
+ public function setPermissions($perms)
+ {
return $this->setPerms($perms);
}
- public function setSize($size) {
+ public function setSize($size)
+ {
$this->size = $size;
+
return $this;
}
- public function setUid($uid) {
+ public function setUid($uid)
+ {
$this->uid = $uid;
+
return $this;
}
- public function setGid($gid) {
+ public function setGid($gid)
+ {
$this->gid = $gid;
+
return $this;
}
- public function setMode($mode) {
+ public function setMode($mode)
+ {
$this->mode = $mode;
+
return $this;
}
- public function setATime($aTime) {
+ public function setATime($aTime)
+ {
$this->aTime = $aTime;
+
return $this;
}
- public function setMTime($mTime) {
+ public function setMTime($mTime)
+ {
$this->mTime = $mTime;
+
return $this;
}
- public function setType($type) {
+ public function setType($type)
+ {
$this->type = $type;
+
return $this;
}
-
- public function getGitPath() {
+
+ public function getGitPath()
+ {
return $this->gitPath;
}
- public function setGitPath($gitPath) {
+ public function setGitPath($gitPath)
+ {
$this->gitPath = $gitPath;
+
return $this;
}
-
+
/**
- *
- * @return type
+ * @return GitLog
*/
- public function getGitLog() {
+ public function getGitLog()
+ {
return $this->gitLog;
}
- public function setGitLog(GitLog $gitLog) {
+ public function setGitLog(GitLog $gitLog)
+ {
$this->gitLog = $gitLog;
+
return $this;
- }
-
- public function isDir(){
- return $this->type === 2?true:false;
}
-
- public function isFile(){
- return $this->type === 1?true:false;
+
+ public function isDir()
+ {
+ return $this->type === 2;
}
-
- public function isLink(){
- return $this->type === 3?true:false;
+
+ public function isFile()
+ {
+ return $this->type === 1;
+ }
+
+ public function isLink()
+ {
+ return $this->type === 3;
}
-
}
diff --git a/src/VersionControl/GitCommandBundle/Event/GitAlterFilesEvent.php b/app/src/VersionControl/GitCommandBundle/Event/GitAlterFilesEvent.php
similarity index 57%
rename from src/VersionControl/GitCommandBundle/Event/GitAlterFilesEvent.php
rename to app/src/VersionControl/GitCommandBundle/Event/GitAlterFilesEvent.php
index 6a2755c..0250a81 100644
--- a/src/VersionControl/GitCommandBundle/Event/GitAlterFilesEvent.php
+++ b/app/src/VersionControl/GitCommandBundle/Event/GitAlterFilesEvent.php
@@ -7,59 +7,78 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitCommandBundle\Event;
+namespace VersionControl\GitCommandBundle\Event;
use Symfony\Component\EventDispatcher\Event;
use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
+use VersionControl\GitControlBundle\Entity\ProjectEnvironment;
- /**
- * This event is triggered whenever git update the files in the
- * working directory. eg Pull, checkout etc,
+/**
+ * This event is triggered whenever git update the files in the
+ * working directory. eg Pull, checkout etc,.
*
* @author Paul Schweppe
*/
class GitAlterFilesEvent extends Event
{
/**
- *
- * @var VersionControl\GitCommandBundle\Entity\ProjectEnvironment
+ * @var ProjectEnvironment
*/
private $gitEnvironment;
-
- private $filesAltered = array();
-
+
+ /**
+ * @var array
+ */
+ private $filesAltered;
+
/**
- *
* @param GitEnvironmentInterface $gitEnvironment
- * @param List of files altered
+ * @param array List of files altered
*/
- public function __construct(GitEnvironmentInterface $gitEnvironment, $files) {
+ public function __construct(GitEnvironmentInterface $gitEnvironment, array $files)
+ {
$this->gitEnvironment = $gitEnvironment;
$this->filesAltered = $files;
}
-
- public function getGitEnvironment() {
+
+ /**
+ * @return GitEnvironmentInterface|ProjectEnvironment
+ */
+ public function getGitEnvironment()
+ {
return $this->gitEnvironment;
}
- public function setGitEnvironment(GitEnvironmentInterface $gitEnvironment) {
+ /**
+ * @param GitEnvironmentInterface $gitEnvironment
+ *
+ * @return $this
+ */
+ public function setGitEnvironment(GitEnvironmentInterface $gitEnvironment)
+ {
$this->gitEnvironment = $gitEnvironment;
+
return $this;
}
-
- public function getFilesAltered() {
+
+ /**
+ * @return array
+ */
+ public function getFilesAltered(): array
+ {
return $this->filesAltered;
}
- public function setFilesAltered($filesAltered) {
+ /**
+ * @param $filesAltered
+ *
+ * @return $this
+ */
+ public function setFilesAltered($filesAltered): self
+ {
$this->filesAltered = $filesAltered;
+
return $this;
}
-
-
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Builder/GitBuilder.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Builder/GitBuilder.php
new file mode 100644
index 0000000..c601c70
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Builder/GitBuilder.php
@@ -0,0 +1,17 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+class GitBuilder
+{
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/AbstractGitCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/AbstractGitCommand.php
new file mode 100644
index 0000000..046fcac
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/AbstractGitCommand.php
@@ -0,0 +1,156 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\GitCommands\GitCommand;
+use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
+use VersionControl\GitCommandBundle\Event\GitAlterFilesEvent;
+use VersionControl\GitControlBundle\Entity\User\User;
+
+/**
+ * Abstract Class for Git commands.
+ *
+ * @author Paul Schweppe
+ */
+class AbstractGitCommand implements InterfaceGitCommand
+{
+ /**
+ * @var GitCommand
+ */
+ protected $command;
+
+ /**
+ * AbstractGitCommand constructor.
+ *
+ * @param GitCommand $command
+ */
+ public function __construct(GitCommand $command)
+ {
+ $this->command = $command;
+ }
+
+ /**
+ * @param $command
+ *
+ * @return string
+ * @throws RunGitCommandException
+ */
+ public function runCommand($command): string
+ {
+ return $this->command->runCommand($command);
+ }
+
+ /**
+ * Gets the number of objects in git repo
+ * The command returns data in the format:
+ * 3251 objects, 15308 kilobytes.
+ *
+ * @return int The number of objects
+ * @throws RunGitCommandException
+ */
+ public function getObjectCount(): int
+ {
+ $result = $this->runCommand('git count-objects');
+ $splits = explode(',', $result);
+ //0 = object count 1 = size
+ $objects = explode(' ', $splits[0]);
+
+ return $objects[0];
+ }
+
+ /**
+ * Splits a block of text on newlines and returns an array.
+ *
+ * @param string $text Text to split
+ * @param bool $trimSpaces If true then each line is trimmed of white spaces. Default true
+ *
+ * @return array Array of lines
+ */
+ public function splitOnNewLine($text, $trimSpaces = true): array
+ {
+ if (!trim($text)) {
+ return array();
+ }
+ $lines = preg_split('/$\R?^/m', $text);
+ if ($trimSpaces) {
+ return array_map(array($this, 'trimSpaces'), $lines);
+ }
+
+ return $lines;
+ }
+
+ /**
+ * @param $value
+ *
+ * @return string
+ */
+ public function trimSpaces($value): string
+ {
+ return trim(trim($value), '\'');
+ }
+
+ /**
+ * @param $eventName
+ * @param $listener
+ */
+ public function addListener($eventName, $listener): void
+ {
+ $this->command->getEventDispatcher()->addListener($eventName, $listener);
+ }
+
+ /**
+ * @param string $eventName
+ */
+ protected function triggerGitAlterFilesEvent($eventName = 'git.alter_files'): void
+ {
+ $event = new GitAlterFilesEvent($this->command->getGitEnvironment(), array());
+ $this->triggerEvent($eventName, $event);
+ }
+
+ /**
+ * @param $eventName
+ * @param $event
+ */
+ protected function triggerEvent($eventName, $event): void
+ {
+ $this->command->dispatcher->dispatch($eventName, $event);
+ }
+
+ /**
+ * Allows you to override the git Environment.
+ *
+ * @param GitEnvironmentInterface $gitEnvironment
+ *
+ * @return AbstractGitCommand
+ */
+ public function overRideGitEnvironment(GitEnvironmentInterface $gitEnvironment): AbstractGitCommand
+ {
+ $this->command->setGitEnvironment($gitEnvironment);
+
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function initGitCommand(): string
+ {
+ $user = $this->command->getGitUser();
+
+ return sprintf(
+ 'git -c user.email="%s" -c user.name="%s" -c core.quotepath=false -c log.showSignature=false',
+ $user->getEmail(),
+ $user->getUsername()
+ );
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php
new file mode 100644
index 0000000..2deb563
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php
@@ -0,0 +1,382 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use Exception;
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\DeleteBranchException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidBranchNameException;
+
+/**
+ * @author Paul Schweppe
+ */
+class GitBranchCommand extends AbstractGitCommand
+{
+ /**
+ * Get current active Branch Name
+ * If there is no commits (eg new repo) then branch name is 'NEW REPO'
+ * This git command needs at least one commit before if show the correct branch name.
+ *
+ * @return string The current branch name
+ * @throws RunGitCommandException
+ */
+ public function getCurrentBranch(): string
+ {
+ try {
+ $branchName = $this->command->runCommand($this->initGitCommand() . ' symbolic-ref --short -q HEAD');
+ } catch (RunGitCommandException $e) {
+ $branchName = $this->getCurrentBranchOldGit();
+ }
+ if (!$branchName) {
+ return '(No Branch)';
+ }
+
+ return trim($branchName);
+ }
+
+ /**
+ * Git "--short" does not work on older Git versions.
+ *
+ * @TODO Check for git version
+ *
+ * @return string
+ * @throws RunGitCommandException
+ */
+ public function getCurrentBranchOldGit(): string
+ {
+ try {
+ $response = $this->command->runCommand('git symbolic-ref HEAD');
+ $tmp = explode('/', $response);
+ return $tmp['2'];
+ } catch (RunGitCommandException $e) {
+ if ($this->getObjectCount() === 0) {
+ return 'NEW REPO';
+ }
+ }
+
+ return '(No Branch)';
+ }
+
+ /**
+ * List all of the branches in your repository.
+ * To list remote branches you may have to do a git fetch to
+ * get latest changes.
+ *
+ * @param bool $local Flag to list local branches only
+ *
+ * @return array
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getBranches($local = false): array
+ {
+ $command = 'git for-each-ref "--format=\'%(refname:short)\'"';
+ if ($local === true) {
+ $command .= ' ' . escapeshellarg('refs/heads/');
+ }
+
+ $localBranches = $this->command->runCommand($command);
+
+ return $this->splitOnNewLine($localBranches);
+ }
+
+ /**
+ * List all of the branches in your repository.
+ * To list remote branches you may have to do a git fetch to
+ * get latest changes.
+ *
+ * @return array
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getRemoteBranches(): array
+ {
+ $command = 'git for-each-ref "--format=\'%(refname:short)\'"';
+
+ $command .= ' ' . escapeshellarg('refs/remotes/');
+
+ $localBranches = $this->command->runCommand($command);
+
+ return $this->splitOnNewLine($localBranches);
+ }
+
+ /**
+ * @return array
+ * @throws RunGitCommandException
+ */
+ public function getBranchRemoteListing(): array
+ {
+ $gitBranches = array();
+
+ $localBranches = $this->getBranches(true);
+
+ $remoteBranches = $this->getRemoteBranches();
+
+ foreach ($remoteBranches as $branchName) {
+ $branchParts = explode('/', $branchName);
+ $isLocal = in_array($branchParts[1], $localBranches, true);
+ $gitBranches[] = array('name' => $branchName, 'local' => $isLocal);
+ }
+
+ return $gitBranches;
+ }
+
+ /**
+ * Creates a new branch. It's important to understand that branches are just pointers to commits.
+ * When you create a branch, all Git needs to do is create a new pointer—it does not change the
+ * repository in any other way.
+ *
+ * @param string $branchName Name of new branch
+ * @param bool $switchToBranch If true the new branch is checked out
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ * @throws InvalidBranchNameException
+ */
+ public function createLocalBranch($branchName, $switchToBranch = false): string
+ {
+ if (false === $this->validateBranchName($branchName)) {
+ throw new InvalidBranchNameException('This is not a valid branch name');
+ }
+
+ $output = $this->command->runCommand(sprintf('git branch %s', escapeshellarg($branchName)));
+
+ if ($switchToBranch) {
+ $output .= $this->command->runCommand(
+ sprintf('git checkout %s 2>&1', escapeshellarg($branchName))
+ );
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+ }
+
+ return $output;
+ }
+
+ /**
+ * Creates a new branch from a remote branch. It's important to understand that branches are just pointers to
+ * commits.
+ * When you create a branch, all Git needs to do is create a new pointer—it does not change the
+ * repository in any other way.
+ *
+ * @param string $branchName Name of new branch
+ * @param $remoteBranchName
+ * @param bool $switchToBranch If true the new branch is checked out
+ *
+ * @return string command response
+ * @throws RuntimeException
+ * @throws InvalidBranchNameException
+ * @throws RunGitCommandException
+ */
+ public function createBranchFromRemote($branchName, $remoteBranchName, $switchToBranch = false): string
+ {
+ if ($this->validateBranchName($branchName)) {
+ $output = $this->command->runCommand(
+ sprintf('git branch %s %s 2>&1', escapeshellarg($branchName), escapeshellarg($remoteBranchName))
+ );
+
+ if ($switchToBranch) {
+ $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+ }
+ } else {
+ throw new InvalidBranchNameException('This is not a valid branch name');
+ }
+
+ return $output;
+ }
+
+ /**
+ * Validates Branch name. Checks if a branch name is allowed.
+ *
+ * @param string $branchName Name of new branch
+ *
+ * @return bool true if valid branch name
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function validateBranchName($branchName): bool
+ {
+ if (strncasecmp(PHP_OS, 'WIN', 3) === 0) {
+ return true;
+ }
+
+ $this->command->runCommand(sprintf('git check-ref-format "refs/heads/%s"', $branchName), false);
+
+ return !($this->command->getLastExitStatus() !== 0);
+ }
+
+ /**
+ * Rename the current branch.
+ *
+ * @param string $branchName
+ *
+ * @return string command output
+ *
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ * @throws InvalidBranchNameException
+ */
+ public function renameCurrentBranch($branchName): string
+ {
+ if (false === $this->validateBranchName($branchName)) {
+ throw new InvalidBranchNameException('This is not a valid branch name');
+ }
+
+ return $this->command->runCommand(sprintf('git branch -m "%s"', $branchName));
+ }
+
+ /**
+ * The git checkout command lets you navigate between the branches created by git branch.
+ * Checking out a branch updates the files in the working directory to match the version
+ * stored in that branch, and it tells Git to record all new commits on that branch.
+ *
+ * @param string $branchName Name of new branch
+ *
+ * @return string command response
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function checkoutBranch($branchName): string
+ {
+ $response = $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Deletes Branch with branch name. Setting $forceDelete equals false is a “safe” operation in that Git prevents
+ * you from
+ * deleting the branch if it has unmerged changes.
+ * Setting $forceDelete equals true force delete the specified branch, even if it has unmerged changes. This is
+ * the command to use
+ * if you want to permanently throw away all of the commits associated with a particular line of development.
+ * Use with caution.
+ *
+ * @param string $branchName Name of branch to delete
+ * @param bool $forceDelete Flag to delete branch, even if it has unmerged changes
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws DeleteBranchException
+ * @throws RuntimeException
+ */
+ public function deleteBranch($branchName, $forceDelete = false): string
+ {
+ $currentBranch = $this->getCurrentBranch();
+ if ($branchName === $currentBranch) {
+ throw new DeleteBranchException(
+ 'You cannot delete the current branch. Please checkout a different branch before deleting.'
+ );
+ }
+ if ($forceDelete === true) {
+ $deleteFlag = '-D';
+ } else {
+ $deleteFlag = '-d';
+ }
+
+ return $this->command->runCommand(
+ sprintf('git branch ' . $deleteFlag . ' %s 2>&1', escapeshellarg($branchName))
+ );
+ }
+
+ /**
+ * Merges current branch with branch of name
+ * Merge the specified branch into the current branch, but always generate a merge commit (even if it was a
+ * fast-forward merge). This is useful for documenting all merges that occur in your repository.
+ *
+ * @param string $branchName Name of branch to delete
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ */
+ public function mergeBranch(string $branchName): string
+ {
+ $currentBranch = $this->getCurrentBranch();
+ if ($branchName === $currentBranch) {
+ throw new RuntimeException(
+ 'You cannot merge a branch with itself. Please checkout a '.
+ 'different branch before trying to merge.'
+ );
+ }
+ $response = $this->command->runCommand(
+ sprintf($this->initGitCommand() . ' merge --no-ff %s', escapeshellarg($branchName))
+ );
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * This attempts to reset your working copy to whatever state it was in before the merge. That means that it
+ * should restore any uncommitted changes
+ * from before the merge, although it cannot always do so reliably.
+ * Generally you shouldn't merge with uncommitted changes anyway.
+ *
+ * Prior to version 1.7.4:
+ *
+ * git reset --merge
+ * This is older syntax but does the same as the above.
+ *
+ * Prior to version 1.6.2:
+ *
+ * git reset --hard
+ * which removes all uncommitted changes, including the uncommitted merge. Sometimes this behaviour is useful
+ * even in newer versions of Git that support the above commands.
+ *
+ * @return string command response
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function abortMerge(): string
+ {
+ $response = $this->command->runCommand('git merge --abort 2>&1');
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * List any files.
+ *
+ * @return array
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function listConflictedFiles(): array
+ {
+ return $this->splitOnNewLine($this->command->runCommand('git diff --name-only --diff-filter=U 2>&1'));
+ }
+
+ /**
+ * Fetch all branches from all remote repositories.
+ *
+ * @return string command response
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function fetchAll(): string
+ {
+ return $this->command->runCommand('git fetch --all 2>&1');
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php
new file mode 100644
index 0000000..2e7e333
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php
@@ -0,0 +1,289 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\Entity\GitFile;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+
+/**
+ * Description of GitFilesCommand.
+ *
+ * @author Paul Schweppe
+ */
+class GitCommitCommand extends AbstractGitCommand
+{
+ /**
+ * @var string
+ */
+ private $statusHash;
+
+ /**
+ * Stage files for commit.
+ * In the short-format, the status of each path is shown as
+ * XY PATH1 -> PATH2
+ * where PATH1 is the path in the HEAD, and the ` -> PATH2` part is shown only when PATH1 corresponds to a
+ * different path in the index/worktree (i.e. the file is renamed). The XY is a two-letter status code.
+ *
+ * The fields (including the ->) are separated from each other by a single space. If a filename contains whitespace
+ * or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by
+ * ASCII double quote (34) characters, and with interior special characters backslash-escaped.
+ * For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that
+ * do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For
+ * untracked paths, XY are ??. Other status codes can be interpreted as follows:
+ * ' ' = unmodified
+ * M = modified
+ * A = added
+ * D = deleted
+ * R = renamed
+ * C = copied
+ * U = updated but unmerged
+ *
+ * Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.
+ *
+ * X Y Meaning
+ * -------------------------------------------------
+ * [MD] not updated
+ * M [ MD] updated in index
+ * A [ MD] added to index
+ * D [ M] deleted from index
+ * R [ MD] renamed in index
+ * C [ MD] copied in index
+ * [MARC] index and work tree matches
+ * [ MARC] M work tree changed since index
+ * [ MARC] D deleted in work tree
+ * -------------------------------------------------
+ * D D unmerged, both deleted
+ * A U unmerged, added by us
+ * U D unmerged, deleted by them
+ * U A unmerged, added by them
+ * D U unmerged, deleted by us
+ * A A unmerged, both added
+ * U U unmerged, both modified
+ * -------------------------------------------------
+ * ? ? untracked
+ * ! ! ignored
+ * -------------------------------------------------
+ * If -b is used the short-format status is preceded by a line
+ *
+ * @TODO: No Support for copy yet
+ *
+ * @param array $files
+ *
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function stageFiles(array $files): void
+ {
+ $gitFiles = $this->getFilesToCommit();
+
+ //Validated that this status is same as previous
+ $deleteFiles = array();
+ $addFiles = array();
+
+ $flippedFiles = array_flip($files);
+
+ foreach ($gitFiles as $fileEntity) {
+ if ($fileEntity->getWorkTreeStatus() === '!' || !isset($flippedFiles[$fileEntity->getPath1()])) {
+ continue;
+ }
+
+ if ($fileEntity->getWorkTreeStatus() === 'D'
+ && ($fileEntity->getIndexStatus() === ' '
+ || $fileEntity->getIndexStatus() === 'M'
+ || $fileEntity->getIndexStatus() === 'A')
+ ) {
+ //Delete files
+ //[ MA] D deleted in work tree
+ $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+ continue;
+ }
+
+ if ($fileEntity->getIndexStatus() === 'R' && ($fileEntity->getWorkTreeStatus() === 'D')) {
+ //Rename delete
+ //[R] D deleted in work tree
+ //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+ $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
+ continue;
+ }
+
+ if ($fileEntity->getIndexStatus() === 'R'
+ && ($fileEntity->getWorkTreeStatus() === 'M'
+ || $fileEntity->getWorkTreeStatus() === 'A'
+ || $fileEntity->getWorkTreeStatus() === ' ')
+ ) {
+ //Rename ADD
+ //[R] [ M]
+ //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+ $addFiles[] = escapeshellarg($fileEntity->getPath2());
+ continue;
+ }
+
+ if ($fileEntity->getWorkTreeStatus() === ' ') {
+ //[MARC] index and work tree matches
+ //Do Nothing
+ continue;
+ }
+
+ $addFiles[] = escapeshellarg($fileEntity->getPath1());
+ }
+
+ //Run the commands once for add and delete
+ if (count($deleteFiles) > 0) {
+ $this->command->runCommand('git rm ' . implode(' ', $deleteFiles));
+ }
+
+ if (count($addFiles) > 0) {
+ $this->command->runCommand('git add ' . implode(' ', $addFiles));
+ }
+ }
+
+ /**
+ * Stages the file to be committed.
+ * Currently supports adding and removing file.
+ *
+ * @TODO Make it more efficent
+ *
+ * @param string $file path to file to commit
+ *
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function stageFile($file): void
+ {
+ $this->stageFiles(array($file));
+ }
+
+ /**
+ * Shortcut to stage all (new, modified, deleted) files.
+ *
+ * @return string Command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function stageAll(): string
+ {
+ return $this->command->runCommand('git add -A');
+ }
+
+ /**
+ * Commits any file that was been staged.
+ *
+ * @param string $message
+ * @param string $author name
+ *
+ * @return string response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function commit($message, $author): string
+ {
+ return $this->command->runCommand(
+ $this->initGitCommand() . ' commit -m '
+ . escapeshellarg($message) . ' --author=' . escapeshellarg($author)
+ );
+ }
+
+ /**
+ * Gets all files that need to be commited.
+ *
+ * @return array Array of GitFile objects
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getFilesToCommit(): array
+ {
+ $statusData = $this->getStatus();
+ $this->statusHash = hash('md5', $statusData);
+
+ return $this->processStatus($statusData);
+ }
+
+ /**
+ * Git status command
+ * Response:
+ * D feedback.html
+ * ?? time-selectors/work.html.
+ *
+ * @return string Command Response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function getStatus(): string
+ {
+ return $this->command->runCommand('git status -u --porcelain', true, false);
+ }
+
+ /**
+ * Process the git status data into GitFile objects.
+ *
+ * @param string $statusData
+ *
+ * @return array Array of GitFile objects
+ */
+ protected function processStatus($statusData): array
+ {
+ $lines = $this->splitOnNewLine($statusData, false);
+
+ if (!is_array($lines) || count($lines) === 0) {
+ return [];
+ }
+
+ $files = [];
+ foreach ($lines as $line) {
+ if (trim($line)) {
+ $files[] = new GitFile($line, $this->command->getGitPath());
+ }
+ }
+
+ return $files;
+ }
+
+ /**
+ * Get hash of git status.
+ *
+ * @return string hash
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getStatusHash(): string
+ {
+ if (!$this->statusHash) {
+ $stausData = $this->getStatus();
+ $this->statusHash = hash('md5', $stausData);
+ }
+
+ return $this->statusHash;
+ }
+
+ /**
+ * Counts the number of files not commited.
+ *
+ * @return int
+ * @throws RuntimeException
+ */
+ public function countStatus(): int
+ {
+ $total = 0;
+ $command = 'git status -u -s';
+
+ try {
+ $response = $this->command->runCommand($command);
+ $lines = $this->splitOnNewLine($response, false);
+ $total = count($lines);
+ } catch (RunGitCommandException $e) {
+ //continue
+ }
+
+ return $total;
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php
new file mode 100644
index 0000000..8b09630
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php
@@ -0,0 +1,154 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\GitCommands\GitDiffParser;
+use VersionControl\GitCommandBundle\Entity\GitCommitFile;
+use VersionControl\GitCommandBundle\Entity\Collections\GitCommitFileCollection;
+
+/**
+ * Description of GitDiffCommand.
+ *
+ * From Git documentation (https://git-scm.com/docs/git-diff):
+ * Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk.
+ * git diff [--options] [--] […]
+ * This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you could tell Git to further add to the index but you still haven’t. You can stage these changes by using git-add[1].
+ *
+ * git diff --no-index [--options] [--] […]
+ * This form is to compare the given two paths on the filesystem. You can omit the --no-index option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git.
+ * git diff [--options] --cached [] [--] […]
+ * This form is to view the changes you staged for the next commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and is not given, it shows all staged changes. --staged is a synonym of --cached.
+ *
+ * git diff [--options] [--] […]
+ * This form is to view the changes you have in your working tree relative to the named . You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch.
+ *
+ * git diff [--options] [--] […]
+ * This is to view the changes between two arbitrary .
+ *
+ * git diff [--options] .. [--] […]
+ * This is synonymous to the previous form. If on one side is omitted, it will have the same effect as using HEAD instead.
+ *
+ * git diff [--options] ... [--] […]
+ * This form is to view the changes on the branch containing and up to the second , starting at a common ancestor of both . "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B". You can omit any one of , which has the same effect as using HEAD instead.
+ *
+ * Just in case if you are doing something exotic, it should be noted that all of the in the above description, except in the last two forms that use ".." notations, can be any .
+ *
+ * For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in gitrevisions[7]. However, "diff" is about comparing two endpoints, not ranges, and the range notations (".." and "...") do not mean a range as defined in the "SPECIFYING RANGES" section in gitrevisions[7].
+ *
+ * git diff [options]
+ * This form is to view the differences between the raw contents of two blob objects.
+ *
+ * @author Paul Schweppe
+ */
+class GitDiffCommand extends AbstractGitCommand
+{
+ /**
+ * Get diff on a file, that has changes that are not committed.
+ * git diff [--options] [--] […]
+ * This form is to view the changes you made relative to the index
+ * (staging area for the next commit). In other words, the differences
+ * are what you could tell Git to further add to the index but you still haven’t.
+ *
+ * @param $filename
+ *
+ * @return array()
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getDiffFile($filename)
+ {
+ $diffString = $this->command->runCommand('git --no-pager diff --oneline '.escapeshellarg($filename).'');
+ $diffParser = new GitDiffParser($diffString);
+ return $diffParser->parse();
+ }
+
+ /**
+ * Get diff on a file between commits.
+ *
+ * @param $filename
+ * @param $previousCommitHash
+ * @param $commitHash
+ *
+ * @return array()
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getDiffFileBetweenCommits($filename, $previousCommitHash, $commitHash)
+ {
+ $diffString = $this->command->runCommand('git --no-pager diff --oneline '.escapeshellarg($previousCommitHash).' '.escapeshellarg($commitHash).' -- '.escapeshellarg($filename).'');
+ $diffParser = new GitDiffParser($diffString);
+ return $diffParser->parse();
+ }
+
+ /**
+ * Returns a list of files effected by a commit.
+ *
+ * @param $commitHash
+ * @return GitCommitFileCollection () Array of VersionControl\GitCommandBundle\Entity\GitCommitFile
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getFilesInCommit($commitHash)
+ {
+ $response = $this->command->runCommand('git diff-tree --no-commit-id --name-status -r '.escapeshellarg($commitHash).'');
+ $responseLines = $this->splitOnNewLine($response);
+ $files = new GitCommitFileCollection();
+ foreach ($responseLines as $line) {
+ $files->addGitCommitFile(new GitCommitFile($line));
+ }
+
+ return $files;
+ }
+
+ /**
+ * Gets the previous Commit Hash by from a commit has and related to a file
+ *
+ * @param string $commitHash
+ * @param bool $fileName
+ *
+ * @return string commit short hash
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getPreviousCommitHash($commitHash = 'HEAD', $fileName = false)
+ {
+ $previousCommitHash = '';
+ $command = " git log --pretty=format:'%h' -n 2 ".escapeshellarg($commitHash).'';
+ if ($fileName !== false) {
+ $command .= ' '.escapeshellarg($fileName);
+ }
+ $response = $this->command->runCommand($command);
+ $responseLines = $this->splitOnNewLine($response);
+ if (count($responseLines) == 2) {
+ $previousCommitHash = trim($responseLines['1']);
+ }
+
+ return $previousCommitHash;
+ }
+
+ /**
+ * Get array of conflict file names
+ *
+ * @return array of conflict file names
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function getConflictFileNames(){
+
+ $command = ' git diff --name-only --diff-filter=U';
+ $response = $this->command->runCommand($command);
+ return$this->splitOnNewLine($response);
+ }
+
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php
new file mode 100644
index 0000000..e5089ba
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php
@@ -0,0 +1,525 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use DirectoryIterator;
+use Exception;
+use RuntimeException;
+use SPLFileInfo;
+use VersionControl\GitCommandBundle\Entity\FileInfoInterface;
+use VersionControl\GitCommandBundle\Entity\RemoteFileInfo;
+use VersionControl\GitCommandBundle\Entity\GitLog;
+use VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidArgumentException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\Entity\FileInfo;
+
+/**
+ * Description of GitFilesCommand.
+ *
+ * @author Paul Schweppe
+ */
+class GitFilesCommand extends AbstractGitCommand
+{
+ /**
+ * List files in directory with git log.
+ *
+ * @param string $dir
+ *
+ * @param string $branch
+ * @param bool $gitFilesOnly
+ *
+ * @return array remoteFileInfo/fileInfo
+ * @throws InvalidDirectoryException
+ * @throws Exception
+ */
+ public function listFiles($dir, $branch = 'master', $gitFilesOnly = false): array
+ {
+ $files = array();
+ $fileList = $this->getFilesInDirectory($dir);
+
+ foreach ($fileList as $fileInfo) {
+ $fileLastLog = $this->getLog(1, $branch, $fileInfo->getGitPath());
+
+ if (count($fileLastLog) > 0) {
+ $fileInfo->setGitLog($fileLastLog[0]);
+ $files[] = $fileInfo;
+ } elseif ($gitFilesOnly === false) {
+ $files[] = $fileInfo;
+ }
+ }
+
+ return $files;
+ }
+
+ /**
+ * @param $path
+ * @param string $branch
+ *
+ * @return SPLFileInfo|RemoteFileInfo
+ * @throws InvalidDirectoryException
+ * @throws Exception
+ */
+ public function getFile($path, $branch = 'master')
+ {
+ $fileInfo = $this->getFileInfo($path);
+ $fileLastLog = $this->getLog(1, $branch, $fileInfo->getGitPath());
+ if (count($fileLastLog) > 0) {
+ $fileInfo->setGitLog($fileLastLog[0]);
+ }
+
+ return $fileInfo;
+ }
+
+ /**
+ * @param $path
+ *
+ * @return SplFileInfo|RemoteFileInfo
+ * @throws InvalidDirectoryException
+ */
+ protected function getFileInfo($path)
+ {
+
+ if ($this->validPathStr($path) === false) {
+ throw new InvalidDirectoryException('Directory path is not valid. Possible security issue.');
+ }
+
+ $basePath = $this->addEndingSlash($this->command->getGitEnvironment()->getPath());
+
+ if ($this->command->getGitEnvironment()->getSsh() === true) {
+ //Remote Directory Listing
+
+ $fileData = $this->command->getSftpProcess()->getFileStats($basePath . $path);
+
+ $fileData['filename'] = basename($path);
+ $fileData['fullPath'] = $basePath . $path;
+ $fileData['gitPath'] = $path;
+
+ return new RemoteFileInfo($fileData);
+ }
+
+ $splFileInfo = new SPLFileInfo($basePath . $path);
+ $splFileInfo->setInfoClass(FileInfo::class);
+
+ $newFileInfo = $splFileInfo->getFileInfo();
+ if (!$newFileInfo instanceof FileInfo) {
+ throw new RuntimeException(sprintf('File info must be a instance of "%s"', FileInfo::class));
+ }
+
+ $newFileInfo->setGitPath($basePath . $path);
+
+ return $newFileInfo;
+ }
+
+ /**
+ * Adds Ending slash where needed for unix and windows paths.
+ *
+ * @param string $path
+ *
+ * @return string
+ */
+ protected function addEndingSlash($path): string
+ {
+ $slash_type = (strpos($path, '\\') === 0) ? 'win' : 'unix';
+ $last_char = $path[strlen($path) - 1];
+ if ($last_char !== '/' && $last_char !== '\\') {
+ // no slash:
+ $path .= ($slash_type === 'win') ? '\\' : '/';
+ }
+
+ return $path;
+ }
+
+ /**
+ * Sort files by directory then name.
+ *
+ * @param array $fileArray
+ */
+ protected function sortFilesByDirectoryThenName(array &$fileArray): void
+ {
+ usort($fileArray, static function (FileInfoInterface $a, FileInfoInterface $b) {
+ if ($a->isDir()) {
+ if ($b->isDir()) {
+ return strnatcasecmp($a->getFilename(), $b->getFilename());
+ }
+
+ return -1;
+ }
+
+ if ($b->isDir()) {
+ return 1;
+ }
+
+ return strnatcasecmp($a->getFilename(), $b->getFilename());
+ });
+ }
+
+ /**
+ * Get files in directory locally and remotely.
+ *
+ * @param string $dir full path to directory
+ *
+ * @return array of files
+ * @throws InvalidDirectoryException
+ */
+ public function getFilesInDirectory($dir): array
+ {
+ if ($this->validPathStr($dir) === false) {
+ throw new InvalidDirectoryException('Directory path is not valid. Possible security issue.');
+ }
+
+ $files = array();
+ $basePath = $this->addEndingSlash($this->command->getGitEnvironment()->getPath());
+ $relativePath = $dir;
+ if ($relativePath) {
+ $relativePath = $this->addEndingSlash($relativePath);
+ }
+
+ if ($this->command->getGitEnvironment()->getSsh() === true) {
+ //Remote Directory Listing
+ $directoryList = $this->command->getSftpProcess()->getDirectoryList($basePath . $relativePath);
+
+ foreach ($directoryList as $filename => $fileData) {
+ if ($filename !== '.' && $filename !== '..' && $filename !== '.git') {
+ $fileData['fullPath'] = $basePath . rtrim($relativePath, '/') . '/' . $filename;
+ $fileData['gitPath'] = $relativePath . $filename;
+
+ $remoteFileInfo = new RemoteFileInfo($fileData);
+
+ $files[] = $remoteFileInfo;
+ }
+ }
+ } else {
+ //Local Directory Listing
+ $directoryIterator = new DirectoryIterator($basePath . $dir);
+ $directoryIterator->setInfoClass(FileInfo::class);
+
+ foreach ($directoryIterator as $fileInfo) {
+ if (!$fileInfo->isDot() && $fileInfo->getFilename() !== '.git') {
+ $newFileInfo = $fileInfo->getFileInfo();
+ if (!$newFileInfo instanceof FileInfo) {
+ throw new RuntimeException(sprintf('File info must be a instance of "%s"', FileInfo::class));
+ }
+ $newFileInfo->setGitPath($relativePath . $fileInfo->getFilename());
+
+ $files[] = $newFileInfo;
+ }
+ }
+ }
+
+ $this->sortFilesByDirectoryThenName($files);
+
+ return $files;
+ }
+
+ /**
+ * Read Git File
+ *
+ * @param FileInfoInterface $file
+ *
+ * @return string file contents
+ */
+ public function readFile(FileInfoInterface $file): string
+ {
+ if ($this->command->getGitEnvironment()->getSsh() === true) {
+ return $this->command->getSftpProcess()->getFileContents($file->getFullPath());
+ }
+
+ return file_get_contents($file->getFullPath());
+ }
+
+ /**
+ * Checks for malicious file paths.
+ *
+ * Returns TRUE if no '//', '..', '\' or control characters are found in the $theFile.
+ * This should make sure that the path is not pointing 'backwards' and further doesn't contain double/back slashes.
+ * So it's compatible with the UNIX style path strings valid for TYPO3 internally.
+ *
+ * @param string $theFile File path to evaluate
+ *
+ * @return bool TRUE, $theFile is allowed path string, FALSE otherwise
+ *
+ * @see http://php.net/manual/en/security.filesystem.nullbytes.php
+ *
+ * @todo Possible improvement: Should it rawurldecode the string first to check if any of these characters is
+ * encoded?
+ */
+ public function validPathStr($theFile): bool
+ {
+ return strpos($theFile, '//') === false
+ && strpos($theFile, '\\') === false
+ && strpos($theFile, '/') !== 0
+ && strpos($theFile, '\\') !== 0
+ && preg_match('#(?:^\\.\\.|/\\.\\./|.git|[[:cntrl:]])#u', $theFile) === 0;
+ }
+
+ /**
+ * @param $filePaths
+ * @param string $mode
+ *
+ * @throws RunGitCommandException
+ */
+ public function setFilesPermissions($filePaths, $mode = '0775'): void
+ {
+ if (false === $this->command->getGitEnvironment()->getSsh()) {
+ return;
+ }
+ //Remote Directory Listing
+ foreach ($filePaths as $filepath) {
+ $this->command->runCommand(sprintf('chmod -R %s %s', $mode, escapeshellarg($filepath)));
+ }
+ }
+
+ /**
+ * @param $filePaths
+ * @param string $user
+ * @param string $group
+ *
+ * @throws RunGitCommandException
+ */
+ public function setFilesOwnerAndGroup($filePaths, $user = 'www-data', $group = 'fr_user'): void
+ {
+ if (false === $this->command->getGitEnvironment()->getSsh()) {
+ return;
+ }
+
+ //Remote Directory Listing
+ if (trim($user)) {
+ foreach ($filePaths as $filepath) {
+ $this->command->runCommand(sprintf('chown -R %s %s', $user, escapeshellarg($filepath)));
+ }
+ }
+ if (trim($group)) {
+ foreach ($filePaths as $filepath) {
+ $this->command->runCommand(sprintf('chgrp -R %s %s', $group, escapeshellarg($filepath)));
+ }
+ }
+ }
+
+ /**
+ * Gets the git log (history) of commits
+ * Currenly limits to the last 20 commits.
+ *
+ * @param int $count
+ * @param string $branch
+ * @param bool $fileName
+ *
+ * @return GitLog|array
+ * @throws Exception
+ */
+ public function getLog($count = 20, $branch = 'master', $fileName = false)
+ {
+ $gitLogCommand = $this->command->command('log');
+
+ $gitLogCommand->setLogCount($count);
+ $gitLogCommand->setBranch($branch);
+ $gitLogCommand->setPath($fileName);
+
+ return $gitLogCommand->execute()->getResults();
+ }
+
+ /**
+ * Check if a file is ignored
+ * EXIT STATUS.
+ * 0
+ * One or more of the provided paths is ignored.
+ *
+ * 1
+ * None of the provided paths are ignored.
+ *
+ * 128
+ * A fatal error was encountered.
+ *
+ * @param string $filePath
+ *
+ * @return bool
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function isFileIgnored($filePath): bool
+ {
+ try {
+ $response = $this->command->runCommand(sprintf('git check-ignore %s', escapeshellarg($filePath)));
+ } catch (RunGitCommandException $e) {
+ if ($this->command->getLastExitStatus() === 128) {
+ throw $e;
+ }
+
+ $response = $this->command->getLastExitStatus() !== 1;
+ }
+
+ return $response ? true : false;
+ }
+
+ /**
+ * Check if a file is been tracked by git.
+ *
+ * @param string $filePath
+ *
+ * @return bool
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function isFileTracked($filePath): bool
+ {
+ $response = $this->command->runCommand(sprintf('git ls-files %s', escapeshellarg($filePath)));
+
+ return trim($response) !== '';
+ }
+
+ /**
+ * Ignore a file by adding to gitignore
+ *
+ * @param string $filePath
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ * @throws FileStatusException
+ * @throws InvalidFilePathException
+ */
+ public function ignoreFile($filePath): string
+ {
+ if (false === $this->fileExists($filePath)) {
+ throw new InvalidFilePathException('File path was not valid. Please check that the file exists.');
+ }
+
+ if ($this->isFileTracked($filePath)) {
+ throw new FileStatusException('File path is been tracked. Please un-track file first');
+ }
+
+ if ($this->isFileIgnored($filePath) === false) {
+ return $this->addToGitIgnore($filePath);
+ }
+
+ throw new FileStatusException('File path is already ignored');
+ }
+
+ /**
+ * Removes file path from git index
+ *
+ * Update your .gitignore file – for instance, add a folder you don't want to track to .gitignore .
+ * git rm -r --cached . – Remove all tracked files, including wanted and unwanted. Your code will be safe as
+ * long as you have saved locally.
+ * git add . – All files will be added back in, except those in .gitignore .
+ *
+ * @param string $filePath
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws InvalidArgumentException
+ * @throws RuntimeException
+ * @throws FileStatusException
+ * @throws InvalidFilePathException
+ */
+ public function unTrackFile($filePath): string
+ {
+ if (false === $this->fileExists($filePath)) {
+ throw new InvalidFilePathException('File path was not valid. Please check that the file exists.');
+ }
+
+ if (false === $this->isFileTracked($filePath)) {
+ throw new FileStatusException('File path is not been tracked');
+ }
+
+ $statusCount = $this->command->command('commit')->countStatus();
+
+ if ($statusCount > 0) {
+ throw new FileStatusException('Please commit all files first');
+ }
+
+ $response = $this->command->runCommand(sprintf('git rm --cached %s', escapeshellarg($filePath)));
+ $response .= "\n Please commit to complete the removal of this file from git index";
+
+ return $response;
+ }
+
+ /**
+ * Checks if a file exists.
+ *
+ * @param string $filePath FilePath excluding base path
+ *
+ * @return bool
+ */
+ public function fileExists($filePath): bool
+ {
+ $basePath = trim($this->addEndingSlash($this->command->getGitEnvironment()->getPath()));
+ if ($this->command->getGitEnvironment()->getSsh() === true) {
+ return $this->command->getSftpProcess()->fileExists($basePath . $filePath);
+ }
+
+ return file_exists($basePath . $filePath);
+ }
+
+ /**
+ * @param $filePath
+ *
+ * @return bool
+ */
+ public function filePathIsIgnored($filePath): bool
+ {
+ $ignoreFiles = $this->getGitIgnoreFile();
+
+ foreach ($ignoreFiles as $ignoreFilePath) {
+ if ($ignoreFilePath === '/' . $filePath) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Gets the contents of gitignore file and
+ * splits on newline and returns it as an array.
+ *
+ * @return array
+ */
+ public function getGitIgnoreFile(): array
+ {
+ $fileData['fullPath'] = '.gitignore';
+ $fileData['gitPath'] = '.gitignore';
+
+ $remoteFileInfo = new RemoteFileInfo($fileData);
+
+ $contents = $this->readFile($remoteFileInfo);
+
+ return $this->splitOnNewLine($contents);
+ }
+
+ /**
+ * @param $filePath
+ *
+ * @return string
+ * @throws RunGitCommandException
+ */
+ public function addToGitIgnore($filePath): string
+ {
+ if (false === $this->fileExists('.gitignore')) {
+ //create file
+ }
+ //Update git ignore file
+ if ($this->command->getGitEnvironment()->getSsh() === true) {
+ $this->command->runCommand(
+ sprintf('echo %s >> .gitignore', escapeshellarg(PHP_EOL . $filePath))
+ );
+
+ return 'File added to .gitignore';
+ }
+
+ file_put_contents('.gitignore', PHP_EOL . $filePath, FILE_APPEND);
+
+ return 'File added to .gitignore';
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitInitCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitInitCommand.php
similarity index 63%
rename from src/VersionControl/GitCommandBundle/GitCommands/Command/GitInitCommand.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitInitCommand.php
index 8c70067..34346ce 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitInitCommand.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitInitCommand.php
@@ -1,53 +1,61 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-
-/**
- * The git init command creates a new Git repository. It can be used to convert
- * an existing, unversioned project to a Git repository or initialize a new empty repository.
- * Most of the other Git commands are not available outside of an initialized
- * repository, so this is usually the first command you’ll run in a new project.
- *
- * Executing git init creates a .git subdirectory in the project root, which contains all
- * of the necessary metadata for the repo. Aside from the .git directory, an existing
- * project remains unaltered
- *
- * @author Paul Schweppe
- */
-class GitInitCommand extends AbstractGitCommand {
-
-
- /**
- * Transform the current directory into a Git repository. This adds a .git folder
- * to the current directory and makes it possible to start recording revisions of
- * the project.
- *
- * @return string command response
- */
- public function initRepository(){
- $response = $this->command->runCommand('git init');
- return $response;
- }
-
- /**
- * Clone the repository located at onto the local machine. The original
- * repository can be located on the local filesystem or on a remote machine
- * accessible via HTTP or SSH.
- * @return string command response
- */
- public function cloneRepository($repo){
- $response = $this->command->runCommand(sprintf('git clone %s . 2>&1', escapeshellarg($repo)));
- return $response;
- }
-
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+
+/**
+ * The git init command creates a new Git repository. It can be used to convert
+ * an existing, unversioned project to a Git repository or initialize a new empty repository.
+ * Most of the other Git commands are not available outside of an initialized
+ * repository, so this is usually the first command you’ll run in a new project.
+ *
+ * Executing git init creates a .git subdirectory in the project root, which contains all
+ * of the necessary metadata for the repo. Aside from the .git directory, an existing
+ * project remains unaltered
+ *
+ * @author Paul Schweppe
+ */
+class GitInitCommand extends AbstractGitCommand
+{
+ /**
+ * Transform the current directory into a Git repository. This adds a .git folder
+ * to the current directory and makes it possible to start recording revisions of
+ * the project.
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function initRepository(): string
+ {
+ return $this->command->runCommand('git init');
+ }
+
+ /**
+ * Clone the repository located at onto the local machine. The original
+ * repository can be located on the local filesystem or on a remote machine
+ * accessible via HTTP or SSH.
+ *
+ * @param $repo
+ *
+ * @return string command response
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function cloneRepository($repo): string
+ {
+ return $this->command->runCommand(sprintf('git clone %s . 2>&1', escapeshellarg($repo)));
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php
similarity index 51%
rename from src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php
index a51e81b..6369c39 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php
@@ -1,432 +1,522 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-use VersionControl\GitCommandBundle\Entity\GitLog;
-
-
-/**
- *
- * @author Paul Schweppe
- */
-class GitLogCommand extends AbstractGitCommand {
-
- /**
- *
- * @var String Log format
- */
- protected $format = '%H | %h | %T | %t | %P | %p | %an | %ae | %ad | %ar | %cn | %ce | %cd | %cr | %s';
-
- /**
- * Limit the number of commits return from command.
- * @var integer
- */
- protected $logCount = 9999999;
-
- /**
- * Pagintation: Number of results to return
- * @var integer
- */
- protected $limit = 30;
-
- /**
- * Pagintation: Current Page
- * @var integer
- */
- protected $page = 0;
-
- /**
- * Pagintation: Total Number of results
- * @var integer
- */
- protected $totalCount = 0;
-
- /**
- * Pagintation: Total Number of pages
- * @var integer
- */
- protected $totalPages = 0;
-
- /**
- * Git log command
- * @var string
- */
- protected $logCommand;
-
- /**
- * Filter log by commit hash. Only returns logs with this hash. Should be only one result.
- * @var string
- */
- protected $commitHash;
-
- /**
- * Filter log by branch name. Only returns commits form this branch
- * @var string
- */
- protected $branch;
-
- /**
- * Enables the --not --remotes flags. Returns commits that have not been
- * pushed to a remote server.
- *
- * @var boolean
- */
- protected $notRemote;
-
- /**
- * Enables the --decorate flag. The --decorate flag makes git log display all of the
- * references (e.g., branches, tags, etc) that point to each commit.
- *
- * This lets you know that the top commit is also checked out (denoted by HEAD) and
- * that it is also the tip of the master branch. The second commit has another branch
- * pointing to it called feature, and finally the 4th commit is tagged as v0.9.
- *
- * Branches, tags, HEAD, and the commit history are almost all of the information contained
- * in your Git repository, so this gives you a more complete view of the logical
- * structure of your repository.
- * @var boolean
- */
- protected $showReferences;
-
- /**
- * Array of log lines.
- * @var array
- */
- protected $logData = array();
-
- /**
- * Filter By Message
- *
- * To filter commits by their commit message, use the --grep flag.
- * @var string
- */
- protected $filterByMessage;
-
- /**
- * Filter by Date After
- * If you’re looking for a commit from a specific time frame, you can use
- * the --after or --before flags for filtering commits by date.
- * These both accept a variety of date formats as a parameter.
- * git log --after="2014-7-1"
- * git log --after="yesterday"
- * git log --after="2014-7-1" --before="2014-7-4"
- *
- * @var string
- */
- protected $filterByDateAfter;
-
- /**
- * Filter by Date After
- * If you’re looking for a commit from a specific time frame, you can use
- * the --after or --before flags for filtering commits by date.
- * These both accept a variety of date formats as a parameter.
- * git log --after="2014-7-1"
- * git log --after="yesterday"
- * git log --after="2014-7-1" --before="2014-7-4"
- *
- * @var string
- */
- protected $filterByDateBefore;
-
- /**
- * Filter By Author
- * When you’re only looking for commits created by a particular user, use the --author flag.
- * This accepts a regular expression, and returns all commits whose author matches that
- * pattern. If you know exactly who you’re looking for, you can use a plain old string
- * instead of a regular expression: --author="John"
- *
- * @var string
- */
- protected $filterByAuthor;
-
- /**
- * Filter By Content
- * Used to search for commits that introduce or remove a particular line of source code.
- * This is called a pickaxe, and it takes the form of -S"". For example, if you
- * want to know when the string Hello, World! was added to any file in the project,
- * you would use the following command:
- * git log -S"Hello, World!"
- *
- * @var string
- */
- protected $filterByContent;
-
-
-
- public function getLogCommand(){
-
- $this->logCommand = 'git --no-pager log -m "--pretty=format:\''.$this->format.'\'"';
- if($this->logCount){
- $this->logCommand .= ' -'.intval($this->logCount).' ';
- }
-
- if($this->showReferences === true){
- $this->logCommand .= ' --decorate ';
- }
-
- if($this->commitHash && $this->branch == false){
- $this->logCommand .= ' '.escapeshellarg($this->commitHash);
- }
-
- //Filters
- if($this->filterByMessage){
- $this->logCommand .= ' --grep='.escapeshellarg($this->filterByMessage).' -i';
- }
-
- if($this->filterByDateAfter){
- $this->logCommand .= ' --after='.escapeshellarg($this->filterByDateAfter);
- }
-
- if($this->filterByDateBefore){
- $this->logCommand .= ' --before='.escapeshellarg($this->filterByDateBefore);
- }
-
- if($this->filterByAuthor){
- $this->logCommand .= ' --author='.escapeshellarg($this->filterByAuthor);
- }
-
- if($this->filterByContent){
- $this->logCommand .= ' -S'.escapeshellarg($this->filterByContent);
- }
-
- if($this->branch){
- //Need to append -- do tell git that its a branch and not a file
- $this->logCommand .= ' '.escapeshellarg(trim($this->branch)).' --';
- }elseif(!$this->commitHash){
- $this->logCommand .= ' --all';
- }
-
- if($this->notRemote){
- $this->logCommand .= ' --not --remotes';
- }
-
- return $this->logCommand;
- }
-
- /**
- * Executes the git log command
- *
- * @return GitLogCommand
- */
- public function execute(){
- $logs = array();
- try{
- $logCommand= $this->getLogCommand();
- $this->logData = $this->command->runCommand($logCommand);
-
- }catch(\RuntimeException $e){
- if($this->getObjectCount() == 0){
- $this->logData = '';
- }else{
- //Throw exception
- throw new \Exception("Error in getting log: ".$e->getMessage());
- }
- }
-
- return $this;
- }
-
- /**
- * Gets the results. Runs any pagination on the log data that is need and
- * converts the log lines into GitLog objects.
- *
- * @return array of GitLog objects
- */
- public function getResults(){
- $logs = array();
- if(is_array($this->logData)){
- return array();
- }
- $lines = $this->splitOnNewLine($this->logData);
-
- if(is_array($lines)){
- $paginatedLines = $this->paginate($lines);
- foreach($paginatedLines as $line){
- if(trim($line)){
- $logs[] = new GitLog($line);
- }
- }
- }
-
- return $logs;
- }
-
- /**
- * Gets the first result. Does not run pagination.
- * Used mostly for commit hash data
- * converts the log lines into GitLog objects.
- *
- * @return GitLog
- */
- public function getFirstResult(){
- $log = null;
- $lines = $this->splitOnNewLine($this->logData);
-
- if(is_array($lines) && count($lines) > 0 ){
- $line = trim($lines[0]);
- $log = new GitLog($line);
- }
-
- return $log;
- }
-
- /**
- * Paginates log lines using array_slice.
- *
- * @param array $lines
- * @return array of lines
- */
- protected function paginate($lines){
- $this->totalCount = count($lines);
- $this->totalPages = ceil( $this->totalCount/ $this->limit );
-
- $page = min($this->page, $this->totalPages );
- $splitOn = $page * $this->limit;
-
- return array_slice($lines, $splitOn, $this->limit);
- }
-
- public function getLogCount() {
- return $this->logCount;
- }
-
- public function getLimit() {
- return $this->limit;
- }
-
- public function getPage() {
- return $this->page;
- }
-
- public function getTotalCount() {
- return $this->totalCount;
- }
-
- public function getTotalPages() {
- return $this->totalPages;
- }
-
- public function getCommitHash() {
- return $this->commitHash;
- }
-
- public function getBranch() {
- return $this->branch;
- }
-
- public function getNotRemote() {
- return $this->notRemote;
- }
-
- public function getShowReferences() {
- return $this->showReferences;
- }
-
- public function getFilterByMessage() {
- return $this->filterByMessage;
- }
-
- public function getFilterByDateAfter() {
- return $this->filterByDateAfter;
- }
-
- public function getFilterByDateBefore() {
- return $this->filterByDateBefore;
- }
-
- public function getFilterByAuthor() {
- return $this->filterByAuthor;
- }
-
- public function getFilterByContent() {
- return $this->filterByContent;
- }
-
- public function setLogCount($logCount) {
- $this->logCount = $logCount;
- return $this;
- }
-
- public function setLimit($limit) {
- $this->limit = $limit;
- return $this;
- }
-
- public function setPage($page) {
- $this->page = $page;
- return $this;
- }
-
- public function setTotalCount($totalCount) {
- $this->totalCount = $totalCount;
- return $this;
- }
-
- public function setTotalPages($totalPages) {
- $this->totalPages = $totalPages;
- return $this;
- }
-
- public function setCommitHash($commitHash) {
- $this->commitHash = $commitHash;
- return $this;
- }
-
- public function setBranch($branch) {
- if($branch !== '(No Branch)'){
- $this->branch = $branch;
- }
- return $this;
- }
-
- public function setNotRemote($notRemote) {
- $this->notRemote = $notRemote;
- return $this;
- }
-
- public function setShowReferences($showReferences) {
- $this->showReferences = $showReferences;
- return $this;
- }
-
- public function setFilterByMessage($filterByMessage) {
- $this->filterByMessage = $filterByMessage;
- return $this;
- }
-
- public function setFilterByDateAfter($filterByDateAfter) {
- $this->filterByDateAfter = $filterByDateAfter;
- return $this;
- }
-
- public function setFilterByDateBefore($filterByDateBefore) {
- $this->filterByDateBefore = $filterByDateBefore;
- return $this;
- }
-
- public function setFilterByAuthor($filterByAuthor) {
- $this->filterByAuthor = $filterByAuthor;
- return $this;
- }
-
- /**
- *
- * @param type $filterByContent
- * @return GitLogCommand
- */
- public function setFilterByContent($filterByContent) {
- $this->filterByContent = $filterByContent;
- return $this;
- }
-
-
-
-}
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use Exception;
+use RuntimeException;
+use VersionControl\GitCommandBundle\Entity\GitLog;
+
+/**
+ * @author Paul Schweppe
+ */
+class GitLogCommand extends AbstractGitCommand
+{
+ /**
+ * @var string Log format
+ */
+ protected $format = '%H | %h | %T | %t | %P | %p | %an | %ae | %ad | %ar | %cn | %ce | %cd | %cr | %s';
+
+ /**
+ * Limit the number of commits return from command.
+ *
+ * @var int
+ */
+ protected $logCount = 9999999;
+
+ /**
+ * Pagination: Number of results to return.
+ *
+ * @var int
+ */
+ protected $limit = 30;
+
+ /**
+ * Pagintation: Current Page.
+ *
+ * @var int
+ */
+ protected $page = 0;
+
+ /**
+ * Pagintation: Total Number of results.
+ *
+ * @var int
+ */
+ protected $totalCount = 0;
+
+ /**
+ * Pagintation: Total Number of pages.
+ *
+ * @var int
+ */
+ protected $totalPages = 0;
+
+ /**
+ * Git log command.
+ *
+ * @var string
+ */
+ protected $logCommand;
+
+ /**
+ * Filter log by commit hash. Only returns logs with this hash. Should be only one result.
+ *
+ * @var string
+ */
+ protected $commitHash;
+
+ /**
+ * Filter log by branch name. Only returns commits form this branch.
+ *
+ * @var string
+ */
+ protected $branch;
+
+ /**
+ * Filter log by path. File name should include the path relative to git folder. Only returns commits
+ * that effect this file.
+ *
+ * @var string
+ */
+ protected $path;
+
+ /**
+ * Enables the --not --remotes flags. Returns commits that have not been
+ * pushed to a remote server.
+ *
+ * @var bool
+ */
+ protected $notRemote;
+
+ /**
+ * Enables the --decorate flag. The --decorate flag makes git log display all of the
+ * references (e.g., branches, tags, etc) that point to each commit.
+ *
+ * This lets you know that the top commit is also checked out (denoted by HEAD) and
+ * that it is also the tip of the master branch. The second commit has another branch
+ * pointing to it called feature, and finally the 4th commit is tagged as v0.9.
+ *
+ * Branches, tags, HEAD, and the commit history are almost all of the information contained
+ * in your Git repository, so this gives you a more complete view of the logical
+ * structure of your repository.
+ *
+ * @var bool
+ */
+ protected $showReferences;
+
+ /**
+ * Array of log lines.
+ *
+ * @var array|string
+ */
+ protected $logData = array();
+
+ /**
+ * Filter By Message.
+ *
+ * To filter commits by their commit message, use the --grep flag.
+ *
+ * @var string
+ */
+ protected $filterByMessage;
+
+ /**
+ * Filter by Date After
+ * If you’re looking for a commit from a specific time frame, you can use
+ * the --after or --before flags for filtering commits by date.
+ * These both accept a variety of date formats as a parameter.
+ * git log --after="2014-7-1"
+ * git log --after="yesterday"
+ * git log --after="2014-7-1" --before="2014-7-4".
+ *
+ * @var string
+ */
+ protected $filterByDateAfter;
+
+ /**
+ * Filter by Date After
+ * If you’re looking for a commit from a specific time frame, you can use
+ * the --after or --before flags for filtering commits by date.
+ * These both accept a variety of date formats as a parameter.
+ * git log --after="2014-7-1"
+ * git log --after="yesterday"
+ * git log --after="2014-7-1" --before="2014-7-4".
+ *
+ * @var string
+ */
+ protected $filterByDateBefore;
+
+ /**
+ * Filter By Author
+ * When you’re only looking for commits created by a particular user, use the --author flag.
+ * This accepts a regular expression, and returns all commits whose author matches that
+ * pattern. If you know exactly who you’re looking for, you can use a plain old string
+ * instead of a regular expression: --author="John".
+ *
+ * @var string
+ */
+ protected $filterByAuthor;
+
+ /**
+ * Filter By Content
+ * Used to search for commits that introduce or remove a particular line of source code.
+ * This is called a pickaxe, and it takes the form of -S"". For example, if you
+ * want to know when the string Hello, World! was added to any file in the project,
+ * you would use the following command:
+ * git log -S"Hello, World!".
+ *
+ * @var string
+ */
+ protected $filterByContent;
+
+ /**
+ * @return string
+ */
+ public function getLogCommand(): string
+ {
+ $this->logCommand = 'git --no-pager log -m "--pretty=format:\'' . $this->format . '\'"';
+ if ($this->logCount) {
+ $this->logCommand .= ' -' . (int)$this->logCount . ' ';
+ }
+
+ if ($this->showReferences === true) {
+ $this->logCommand .= ' --decorate ';
+ }
+
+ if ($this->commitHash && $this->branch == false) {
+ $this->logCommand .= ' ' . escapeshellarg($this->commitHash);
+ }
+
+ //Filters
+ if ($this->filterByMessage) {
+ $this->logCommand .= ' --grep=' . escapeshellarg($this->filterByMessage) . ' -i';
+ }
+
+ if ($this->filterByDateAfter) {
+ $this->logCommand .= ' --after=' . escapeshellarg($this->filterByDateAfter);
+ }
+
+ if ($this->filterByDateBefore) {
+ $this->logCommand .= ' --before=' . escapeshellarg($this->filterByDateBefore);
+ }
+
+ if ($this->filterByAuthor) {
+ $this->logCommand .= ' --author=' . escapeshellarg($this->filterByAuthor);
+ }
+
+ if ($this->filterByContent) {
+ $this->logCommand .= ' -S' . escapeshellarg($this->filterByContent);
+ }
+
+ if ($this->branch) {
+ $this->logCommand .= ' ' . escapeshellarg(trim($this->branch));
+ } elseif (!$this->commitHash) {
+ $this->logCommand .= ' --all';
+ }
+
+ if ($this->notRemote) {
+ $this->logCommand .= ' --not --remotes';
+ }
+
+ // To prevent confusion with options and branch names, paths may need to be prefixed with "-- " to separate
+ // them from options or refnames.
+ $this->logCommand .= ' --';
+
+ //Show only commits that affect any of the specified paths.
+ if ($this->path) {
+ $this->logCommand .= ' ' . escapeshellarg(trim($this->path));
+ }
+
+ return $this->logCommand;
+ }
+
+ /**
+ * Executes the git log command.
+ *
+ * @return GitLogCommand
+ * @throws Exception
+ */
+ public function execute(): GitLogCommand
+ {
+ try {
+ $logCommand = $this->getLogCommand();
+ $this->logData = $this->command->runCommand($logCommand);
+ } catch (RuntimeException $e) {
+ if ($this->getObjectCount() !== 0) {
+ throw new RuntimeException('Error in getting log: ' . $e->getMessage());
+ }
+ $this->logData = '';
+ }
+
+ return $this;
+ }
+
+ /**
+ * Gets the results. Runs any pagination on the log data that is need and
+ * converts the log lines into GitLog objects.
+ *
+ * @return array of GitLog objects
+ */
+ public function getResults(): array
+ {
+ $logs = array();
+ if (is_array($this->logData)) {
+ return [];
+ }
+
+ $lines = $this->splitOnNewLine($this->logData);
+
+ if (is_array($lines)) {
+ $paginatedLines = $this->paginate($lines);
+ foreach ($paginatedLines as $line) {
+ if (trim($line)) {
+ $logs[] = new GitLog($line);
+ }
+ }
+ }
+
+ return $logs;
+ }
+
+ /**
+ * Gets the first result. Does not run pagination.
+ * Used mostly for commit hash data
+ * converts the log lines into GitLog objects.
+ *
+ * @return GitLog
+ */
+ public function getFirstResult(): GitLog
+ {
+ $log = null;
+ $lines = $this->splitOnNewLine($this->logData);
+
+ if (is_array($lines) && count($lines) > 0) {
+ $line = trim($lines[0]);
+ $log = new GitLog($line);
+ }
+
+ return $log;
+ }
+
+ /**
+ * Paginates log lines using array_slice.
+ *
+ * @param array $lines
+ *
+ * @return array of lines
+ */
+ protected function paginate($lines): array
+ {
+ $this->totalCount = count($lines);
+ $this->totalPages = ceil($this->totalCount / $this->limit);
+
+ $page = min($this->page, $this->totalPages);
+ $splitOn = $page * $this->limit;
+
+ return array_slice($lines, $splitOn, $this->limit);
+ }
+
+ public function getLogCount(): int
+ {
+ return $this->logCount;
+ }
+
+ public function getLimit(): int
+ {
+ return $this->limit;
+ }
+
+ public function getPage(): int
+ {
+ return $this->page;
+ }
+
+ public function getTotalCount(): int
+ {
+ return $this->totalCount;
+ }
+
+ public function getTotalPages(): int
+ {
+ return $this->totalPages;
+ }
+
+ public function getCommitHash(): string
+ {
+ return $this->commitHash;
+ }
+
+ public function getBranch(): string
+ {
+ return $this->branch;
+ }
+
+ public function getNotRemote(): bool
+ {
+ return $this->notRemote;
+ }
+
+ public function getShowReferences(): bool
+ {
+ return $this->showReferences;
+ }
+
+ public function getFilterByMessage(): string
+ {
+ return $this->filterByMessage;
+ }
+
+ public function getFilterByDateAfter(): string
+ {
+ return $this->filterByDateAfter;
+ }
+
+ public function getFilterByDateBefore(): string
+ {
+ return $this->filterByDateBefore;
+ }
+
+ public function getFilterByAuthor(): string
+ {
+ return $this->filterByAuthor;
+ }
+
+ public function getFilterByContent(): string
+ {
+ return $this->filterByContent;
+ }
+
+ public function setLogCount($logCount)
+ {
+ $this->logCount = $logCount;
+
+ return $this;
+ }
+
+ public function setLimit($limit)
+ {
+ $this->limit = $limit;
+
+ return $this;
+ }
+
+ public function setPage($page)
+ {
+ $this->page = $page;
+
+ return $this;
+ }
+
+ public function setTotalCount($totalCount)
+ {
+ $this->totalCount = $totalCount;
+
+ return $this;
+ }
+
+ public function setTotalPages($totalPages)
+ {
+ $this->totalPages = $totalPages;
+
+ return $this;
+ }
+
+ public function setCommitHash($commitHash)
+ {
+ $this->commitHash = $commitHash;
+
+ return $this;
+ }
+
+ public function setBranch($branch)
+ {
+ if ($branch !== '(No Branch)') {
+ $this->branch = $branch;
+ }
+
+ return $this;
+ }
+
+ public function setNotRemote($notRemote)
+ {
+ $this->notRemote = $notRemote;
+
+ return $this;
+ }
+
+ public function setShowReferences($showReferences)
+ {
+ $this->showReferences = $showReferences;
+
+ return $this;
+ }
+
+ public function setFilterByMessage($filterByMessage)
+ {
+ $this->filterByMessage = $filterByMessage;
+
+ return $this;
+ }
+
+ public function setFilterByDateAfter($filterByDateAfter)
+ {
+ $this->filterByDateAfter = $filterByDateAfter;
+
+ return $this;
+ }
+
+ public function setFilterByDateBefore($filterByDateBefore)
+ {
+ $this->filterByDateBefore = $filterByDateBefore;
+
+ return $this;
+ }
+
+ public function setFilterByAuthor($filterByAuthor)
+ {
+ $this->filterByAuthor = $filterByAuthor;
+
+ return $this;
+ }
+
+ /**
+ * @param string $filterByContent
+ *
+ * @return GitLogCommand
+ */
+ public function setFilterByContent($filterByContent): GitLogCommand
+ {
+ $this->filterByContent = $filterByContent;
+
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getPath(): string
+ {
+ return $this->path;
+ }
+
+ /**
+ * @param $path
+ *
+ * @return GitLogCommand
+ */
+ public function setPath($path): self
+ {
+ $this->path = $path;
+
+ return $this;
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php
new file mode 100644
index 0000000..9fa8069
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php
@@ -0,0 +1,241 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\Entity\GitFile;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+
+/**
+ * @author Paul Schweppe
+ */
+class GitStatusCommand extends AbstractGitCommand
+{
+ /**
+ * @var string Git Status Hash.
+ * Used to make sure no changes has occurred since last check
+ */
+ protected $statusHash;
+
+ /**
+ * Get hash of git status.
+ *
+ * @return string hash
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getStatusHash(): string
+ {
+ if (!$this->statusHash) {
+ $statusData = $this->getStatus();
+ $this->statusHash = hash('md5', $statusData);
+ }
+
+ return $this->statusHash;
+ }
+
+ /**
+ * Gets all files that need to be commited.
+ *
+ * @return array Array of GitFile objects
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getFilesToCommit(): array
+ {
+ $stausData = $this->getStatus();
+ $this->statusHash = hash('md5', $stausData);
+
+ return $this->processStatus($stausData);
+ }
+
+ /**
+ * Git status command
+ * Response:
+ * D feedback.html
+ * ?? time-selectors/work.html.
+ *
+ * @return string Command Response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function getStatus(): string
+ {
+ return $this->command->runCommand('git status -u --porcelain', true, false);
+ }
+
+ /**
+ * Stage files for commit.
+ * In the short-format, the status of each path is shown as
+ * XY PATH1 -> PATH2
+ * where PATH1 is the path in the HEAD, and the ` -> PATH2` part is shown only when PATH1 corresponds to a
+ * different path in the index/worktree (i.e. the file is renamed). The XY is a two-letter status code.
+ *
+ * The fields (including the ->) are separated from each other by a single space. If a filename contains whitespace
+ * or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by
+ * ASCII double quote (34) characters, and with interior special characters backslash-escaped.
+ * For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that
+ * do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For
+ * untracked paths, XY are ??. Other status codes can be interpreted as follows:
+ * ' ' = unmodified
+ * M = modified
+ * A = added
+ * D = deleted
+ * R = renamed
+ * C = copied
+ * U = updated but unmerged
+ *
+ * Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.
+ *
+ * X Y Meaning
+ * -------------------------------------------------
+ * [MD] not updated
+ * M [ MD] updated in index
+ * A [ MD] added to index
+ * D [ M] deleted from index
+ * R [ MD] renamed in index
+ * C [ MD] copied in index
+ * [MARC] index and work tree matches
+ * [ MARC] M work tree changed since index
+ * [ MARC] D deleted in work tree
+ * -------------------------------------------------
+ * D D unmerged, both deleted
+ * A U unmerged, added by us
+ * U D unmerged, deleted by them
+ * U A unmerged, added by them
+ * D U unmerged, deleted by us
+ * A A unmerged, both added
+ * U U unmerged, both modified
+ * -------------------------------------------------
+ * ? ? untracked
+ * ! ! ignored
+ * -------------------------------------------------
+ * If -b is used the short-format status is preceded by a line
+ *
+ * @TODO: No Support for copy yet
+ *
+ * @param array $files
+ *
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function stageFiles(array $files): void
+ {
+ $gitFiles = $this->getFilesToCommit();
+
+ //Validated that this status is same as previous
+ $deleteFiles = array();
+ $addFiles = array();
+
+ $flippedFiles = array_flip($files);
+
+ foreach ($gitFiles as $fileEntity) {
+ if (!isset($flippedFiles[$fileEntity->getPath1()])) {
+ continue;
+ }
+
+ if ($fileEntity->getWorkTreeStatus() === '!') {
+ //do Nothing ignore
+ continue;
+ }
+
+ if ($fileEntity->getWorkTreeStatus() === 'D'
+ && ($fileEntity->getIndexStatus() === ' '
+ || $fileEntity->getIndexStatus() === 'M'
+ || $fileEntity->getIndexStatus() === 'A'
+ )
+ ) {
+ //Delete files
+ //[ MA] D deleted in work tree
+ $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+ continue;
+ }
+
+ if ($fileEntity->getIndexStatus() === 'R' && ($fileEntity->getWorkTreeStatus() === 'D')) {
+ //Rename delete
+ //[R] D deleted in work tree
+ $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
+ continue;
+ }
+
+ if ($fileEntity->getIndexStatus() === 'R'
+ && ($fileEntity->getWorkTreeStatus() === 'M'
+ || $fileEntity->getWorkTreeStatus() === 'A'
+ || $fileEntity->getWorkTreeStatus() === ' ')
+ ) {
+ //Rename ADD
+ //[R] [ M]
+ $addFiles[] = escapeshellarg($fileEntity->getPath2());
+ continue;
+ }
+
+ if ($fileEntity->getWorkTreeStatus() === ' ') {
+ //[MARC] index and work tree matches
+ //Do Nothing
+ continue;
+ }
+
+ $addFiles[] = escapeshellarg($fileEntity->getPath1());
+ }
+
+ //Run the commands once for add and delete
+ if (count($deleteFiles) > 0) {
+ $this->command->runCommand('git rm ' . implode(' ', $deleteFiles));
+ }
+
+ if (count($addFiles) > 0) {
+ $this->command->runCommand('git add ' . implode(' ', $addFiles));
+ }
+ }
+
+ /**
+ * Stages the file to be committed.
+ * Currently supports adding and removing file.
+ *
+ * @TODO Make it more effecient
+ *
+ * @param string $file path to file to commit
+ *
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function stageFile($file): void
+ {
+ $this->stageFiles(array($file));
+ }
+
+ /**
+ * Process the git status data into GitFile objects.
+ *
+ * @param string $statusData
+ *
+ * @return array Array of GitFile objects
+ */
+ protected function processStatus($statusData): array
+ {
+ $lines = $this->splitOnNewLine($statusData, false);
+
+ if (!is_array($lines) || count($lines) === 0) {
+ return [];
+ }
+
+ $files = array();
+ foreach ($lines as $line) {
+ if (trim($line)) {
+ $files[] = new GitFile($line, $this->command->getGitPath());
+ }
+ }
+
+ return $files;
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php
new file mode 100644
index 0000000..12a159d
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php
@@ -0,0 +1,316 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+
+/**
+ * Git uses a collaboration modal,which gives every developer their own copy of the repository, complete with its own
+ * local history and branch structure. Users typically need to share a series of commits rather than a single changeset.
+ * Instead of committing a changeset from a working copy to the central repository, Git lets you share entire branches
+ * between repositories.
+ *
+ * The commands below let you manage connections with other repositories,
+ * publish local history by “pushing” branches to other repositories,
+ * and see what others have contributed by “pulling” branches into your local repository.
+ * Commands:
+ * remote
+ * fetch
+ * push
+ * pull
+ *
+ * @author Paul Schweppe
+ */
+class GitSyncCommand extends AbstractGitCommand
+{
+ protected $pullRebase = false;
+
+ /**
+ * List the remote connections you have to other repositories.
+ *
+ * $ git remote
+ * origin
+ *
+ * @return array() Array of remote names
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function getRemotes(): array
+ {
+ return $this->splitOnNewLine($this->command->runCommand('git remote'));
+ }
+
+ /**
+ * List the remote connections you have to other repositories with "URL"
+ * $ git remote -v
+ * origin https://github.com/schacon/ticgit (fetch)
+ * origin https://github.com/schacon/ticgit (push)
+ * pb https://github.com/paulboone/ticgit (fetch)
+ * pb https://github.com/paulboone/ticgit (push).
+ *
+ * @return array eg (array(0 => "origin", 1 => "https://github.com/schacon/ticgit", 2 => "(push)")
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function getRemoteVersions(): array
+ {
+
+ $lines = $this->splitOnNewLine($this->command->runCommand('git remote -v'));
+ $lineCount = count($lines);
+
+ if ($lineCount <= 2) {
+ return [];
+ }
+
+ $remotes = array();
+ for ($i = 1; $i < $lineCount; $i += 2) {
+ $parts = preg_split('/\s+/', $lines[$i]);
+ if ($parts[2] === '(push)') {
+ $remotes[] = $parts;
+ }
+ }
+
+ return $remotes;
+ }
+
+ /**
+ * Create a new connection to a remote repository. After adding a remote, you’ll be able to use
+ * $remote as a convenient shortcut for $url in other Git commands.
+ *
+ * It’s generally not possible to push commits to a HTTP address.
+ * For read-write access, you should use SSH instead.
+ *
+ * @param string $remote
+ * @param string $url
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function addRemote($remote, $url): string
+ {
+ $remotes = $this->command->runCommand(
+ sprintf(
+ 'git remote add %s %s 2>&1',
+ escapeshellarg($remote),
+ escapeshellarg($url)
+ )
+ );
+
+ return $remotes;
+ }
+
+ /**
+ * Remove the connection to the remote repository called $remote.
+ *
+ * @param string $remote
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function deleteRemote($remote): string
+ {
+ return $this->command->runCommand(sprintf('git remote rm %s 2>&1', escapeshellarg($remote)));
+ }
+
+ /**
+ * Remove the connection to the remote repository called $remote.
+ *
+ * @param string $remote
+ *
+ * @param $newRemote
+ *
+ * @return string
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function renameRemote($remote, $newRemote): string
+ {
+ $remotes = $this->command->runCommand(
+ sprintf(
+ 'git remote rename %s %s 2>&1',
+ escapeshellarg($remote),
+ escapeshellarg($newRemote)
+ )
+ );
+
+ return $remotes;
+ }
+
+ /**
+ * Fetch all of the branches from the repository.
+ *
+ * @param string $remote Name of remote Repository
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function fetchAll($remote): string
+ {
+ return $this->command->runCommand(sprintf('git fetch %s 2>&1', escapeshellarg($remote)));
+ }
+
+ /**
+ * Fetch changes from the remote server.
+ *
+ * @param string $remote Name of remote Repository
+ * @param string $branch Branch to fetch
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function fetch($remote, $branch): string
+ {
+ return $this->command->runCommand(
+ sprintf(
+ 'git fetch %s %s 2>&1',
+ escapeshellarg($remote),
+ escapeshellarg($branch)
+ )
+ );
+ }
+
+ /**
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function resetPullRequest(): string
+ {
+ $response = $this->command->runCommand('git reset --hard ORIG_HEAD');
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Push specified branch to the remote repository.
+ *
+ * @param string $remote The remote server to push to eg origin
+ * @param string $branch The branch to push to the remote server eg master
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function push($remote, $branch): string
+ {
+ $command = sprintf('git push %s %s', escapeshellarg(trim($remote)), escapeshellarg(trim($branch)));
+
+ return $this->command->runCommand($command);
+ }
+
+ /**
+ * Push all of your local branches to the specified remote repository.
+ *
+ * @param string $remote The remote server to push to eg origin
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function pushAll($remote): string
+ {
+ $command = sprintf('git push %s --all', escapeshellarg($remote));
+
+ return $this->command->runCommand($command);
+ }
+
+ /**
+ * Tags are not automatically pushed when you push a branch or use the --all option.
+ * The --tags flag sends all of your local tags to the remote repository.
+ *
+ * @param string $remote The remote server to push to eg origin
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function pushTags($remote): string
+ {
+ $command = sprintf('git push %s --tags 2>&1', escapeshellarg($remote));
+
+ return $this->command->runCommand($command);
+ }
+
+ /**
+ * Pull changes to the remote repository.
+ *
+ * @param string $remote The remote server to push to eg origin
+ * @param string $branch The branch to push to the remote server eg master
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function pull($remote, $branch): string
+ {
+ $command = 'git pull';
+ if ($this->pullRebase) {
+ $command .= ' --rebase';
+ }
+
+ $command = sprintf($command . ' %s %s', escapeshellarg($remote), escapeshellarg($branch));
+
+ $response = $this->command->runCommand($command);
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Gets the number of commits ahead and behind a remote branch.
+ * Needs to call fetch first.
+ *
+ * This request should support caching
+ *
+ * @param string $branch local branch name
+ *
+ * @return array
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function commitCountWithRemote($branch): array
+ {
+ $remotes = $this->getRemotes();
+
+ if (count($remotes) === 0) {
+ return array('pushCount' => 0, 'pullCount' => 0);
+ }
+
+ $remoteBranch = $remotes[0] . '/' . $branch;
+ try {
+ $command = sprintf(
+ 'git rev-list --count --left-right %s...%s',
+ escapeshellarg(trim($branch)),
+ escapeshellarg(trim($remoteBranch))
+ );
+ $response = $this->command->runCommand($command);
+
+ [$pushCount, $pullCount] = explode(' ', $response);
+ return array('pushCount' => trim($pushCount), 'pullCount' => trim($pullCount));
+ } catch (RunGitCommandException $e) {
+ //Remote branch does not exist. Do nothing
+ }
+
+ return array('pushCount' => 0, 'pullCount' => 0);
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitTagCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitTagCommand.php
new file mode 100644
index 0000000..1b3ba58
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitTagCommand.php
@@ -0,0 +1,112 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidBranchNameException;
+use VersionControl\GitCommandBundle\Entity\GitTag;
+
+/**
+ * @author Paul Schweppe
+ */
+class GitTagCommand extends AbstractGitCommand
+{
+ /**
+ * List all of the Tags in your repository.
+ *
+ * @return array | GitTag
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function getTags()
+ {
+ $tagEntities = [];
+ $command = "git for-each-ref --format '%(refname:short)|%(subject)|%(taggerdate)|%(taggername)|%(taggeremail)"
+ ."|%(*objectname)|%(*objectname:short)' refs/tags --sort=taggerdate";
+
+ $tags = $this->command->runCommand($command);
+ $lines = $this->splitOnNewLine($tags);
+
+ foreach ($lines as $line) {
+ $tagEntities[] = new GitTag($line);
+ }
+
+ rsort($tagEntities);
+
+ return $tagEntities;
+ }
+
+ /**
+ * Creates a new Tag.
+ *
+ * @param $version
+ * @param $message
+ * @param bool $commitShortCode
+ *
+ * @return string command response
+ * @throws RuntimeException
+ * @throws InvalidBranchNameException
+ * @throws RunGitCommandException
+ */
+ public function createAnnotatedTag($version, $message, $commitShortCode = false): string
+ {
+ if (false === $this->validateTagName($version)) {
+ throw new InvalidBranchNameException('This is not a valid branch name');
+ }
+
+ $command = sprintf($this->initGitCommand().' tag -a %s -m %s', escapeshellarg($version), escapeshellarg($message));
+ if ($commitShortCode) {
+ $command .= ' ' . escapeshellarg($commitShortCode);
+ }
+
+ return $this->command->runCommand($command);
+ }
+
+ /**
+ * Push specified tag to the remote repository.
+ *
+ * @param string $remote The remote server to push to eg origin
+ * @param string $tag The tag to push to the remote server eg v0.1.0
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function pushTag($remote, $tag): string
+ {
+ $command = sprintf($this->initGitCommand().' push %s %s', escapeshellarg(trim($remote)), escapeshellarg(trim($tag)));
+
+ return $this->command->runCommand($command);
+ }
+
+ /**
+ * Validates Tag name. Checks if a tag name is allowed.
+ *
+ * @param string $tagName Name of new branch
+ *
+ * @return bool true if valid branch name
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function validateTagName($tagName): bool
+ {
+ if (strncasecmp(PHP_OS, 'WIN', 3) === 0) {
+ return true;
+ }
+
+ $this->command->runCommand(sprintf('git check-ref-format "refs/tags/%s"', $tagName), false);
+
+ return !($this->command->getLastExitStatus() !== 0);
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUndoCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUndoCommand.php
new file mode 100644
index 0000000..47ac7fb
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUndoCommand.php
@@ -0,0 +1,184 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Command;
+
+use RuntimeException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+
+/**
+ * @author Paul Schweppe
+ */
+class GitUndoCommand extends AbstractGitCommand
+{
+ /**
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function resetPullRequest(): string
+ {
+ return $this->command->runCommand('git reset --hard ORIG_HEAD');
+ }
+
+ /**
+ * Reverts commit but keeps the files unchanged.
+ *
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function undoCommit(): string
+ {
+ return $this->command->runCommand('git reset --soft HEAD~1');
+ }
+
+ /**
+ * @return string command response
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function undoCommitHard(): string
+ {
+ return $this->command->runCommand('git reset --hard HEAD~1');
+ }
+
+ /**
+ * Update all files in the working directory to match the specified commit.
+ * You can use either a commit hash or a tag as the $commitHash argument.
+ * This will put you in a detached HEAD state.
+ *
+ * @param string $commitHash
+ *
+ * @return string
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function checkoutCommit($commitHash = 'HEAD'): string
+ {
+ $response = $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($commitHash)));
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Check out a previous version of a file. This turns the that resides in the working directory into an
+ * exact copy of the one from and adds it to the staging area.
+ *
+ * @param string $file
+ * @param string $commitHash
+ *
+ * @param bool $triggerGitAlterFilesEvent
+ *
+ * @return string
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function checkoutFile($file, $commitHash = 'HEAD', $triggerGitAlterFilesEvent = true): string
+ {
+ $response = $this->command->runCommand(
+ sprintf('git checkout %s %s', escapeshellarg($commitHash), escapeshellarg($file))
+ );
+
+ //Trigger file alter Event
+ if ($triggerGitAlterFilesEvent === true) {
+ $this->triggerGitAlterFilesEvent();
+ }
+
+ return $response;
+ }
+
+ /**
+ * Check out a file from merge
+ *
+ * @param string $file
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function checkoutTheirFile($file): string
+ {
+ $this->command->runCommand(sprintf('git checkout --theirs %s', escapeshellarg($file)));
+ $this->command->runCommand(sprintf('git add %s', escapeshellarg($file)));
+ $response = 'Using their merged in file for "' . $file . '"';
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Check out a file from merge conflict
+ *
+ * @param string $file
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function checkoutOurFile($file): string
+ {
+ $this->command->runCommand(sprintf('git checkout --ours %s', escapeshellarg($file)));
+ $this->command->runCommand(sprintf('git add %s', escapeshellarg($file)));
+ $response = 'Using original file from current branch for "' . $file . '"';
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Check out a file from merge conflict
+ *
+ * @param string $file
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function addFile($file): string
+ {
+ $this->command->runCommand(sprintf('git add %s', escapeshellarg($file)));
+ $response = 'Manually fixed file "' . $file . '"';
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+
+ /**
+ * Check out a file from merge conflict
+ *
+ * @param string $file
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function deleteFile($file): string
+ {
+ $this->command->runCommand(sprintf('git rm %s', escapeshellarg($file)));
+ $response = 'Delete file "' . $file . '"';
+
+ //Trigger file alter Event
+ $this->triggerGitAlterFilesEvent();
+
+ return $response;
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUserInterface.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUserInterface.php
new file mode 100644
index 0000000..0318563
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUserInterface.php
@@ -0,0 +1,18 @@
+
*/
-interface InterfaceGitCommand {
-
+interface InterfaceGitCommand
+{
}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Exception/DeleteBranchException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/DeleteBranchException.php
similarity index 81%
rename from src/VersionControl/GitCommandBundle/GitCommands/Exception/DeleteBranchException.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Exception/DeleteBranchException.php
index 88fd163..4e4642c 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Exception/DeleteBranchException.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/DeleteBranchException.php
@@ -8,14 +8,16 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+use Exception;
+
/**
* InvalidArgumentException.
*
* @author Paul Schweppe
*/
-class DeleteBranchException extends \Exception implements ExceptionInterface
+class DeleteBranchException extends Exception implements ExceptionInterface
{
-
}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Exception/ExceptionInterface.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/ExceptionInterface.php
similarity index 99%
rename from src/VersionControl/GitCommandBundle/GitCommands/Exception/ExceptionInterface.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Exception/ExceptionInterface.php
index af69c13..6b7053c 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Exception/ExceptionInterface.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/ExceptionInterface.php
@@ -8,6 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\GitCommands\Exception;
interface ExceptionInterface
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/FileStatusException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/FileStatusException.php
new file mode 100644
index 0000000..0ebe83d
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/FileStatusException.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+
+use Exception;
+
+/**
+ * InvalidDirectoryException.
+ *
+ * @author Paul Schweppe
+ */
+class FileStatusException extends Exception implements ExceptionInterface
+{
+}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidArgumentException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidArgumentException.php
similarity index 99%
rename from src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidArgumentException.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidArgumentException.php
index 82be494..91871a9 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidArgumentException.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidArgumentException.php
@@ -8,6 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\GitCommands\Exception;
/**
@@ -17,5 +18,4 @@
*/
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
-
}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidBranchNameException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidBranchNameException.php
similarity index 80%
rename from src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidBranchNameException.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidBranchNameException.php
index c000b3a..ce79d4c 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidBranchNameException.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidBranchNameException.php
@@ -8,14 +8,16 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+use Exception;
+
/**
* InvalidArgumentException.
*
* @author Paul Schweppe
*/
-class InvalidBranchNameException extends \Exception implements ExceptionInterface
+class InvalidBranchNameException extends Exception implements ExceptionInterface
{
-
}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidDirectoryException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidDirectoryException.php
new file mode 100644
index 0000000..4f15047
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidDirectoryException.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+
+use Exception;
+
+/**
+ * InvalidDirectoryException.
+ *
+ * @author Paul Schweppe
+ */
+class InvalidDirectoryException extends Exception implements ExceptionInterface
+{
+}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidFilePathException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidFilePathException.php
new file mode 100644
index 0000000..36abf4b
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/InvalidFilePathException.php
@@ -0,0 +1,23 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+
+use Exception;
+
+/**
+ * InvalidDirectoryException.
+ *
+ * @author Paul Schweppe
+ */
+class InvalidFilePathException extends Exception implements ExceptionInterface
+{
+}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Exception/RunGitCommandException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/RunGitCommandException.php
similarity index 81%
rename from src/VersionControl/GitCommandBundle/GitCommands/Exception/RunGitCommandException.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Exception/RunGitCommandException.php
index 60a5d03..caf7b90 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Exception/RunGitCommandException.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/RunGitCommandException.php
@@ -8,14 +8,16 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+use Exception;
+
/**
* InvalidArgumentException.
*
* @author Paul Schweppe
*/
-class RunGitCommandException extends \Exception implements ExceptionInterface
+class RunGitCommandException extends Exception implements ExceptionInterface
{
-
}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Exception/SshLoginException.php b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/SshLoginException.php
similarity index 82%
rename from src/VersionControl/GitCommandBundle/GitCommands/Exception/SshLoginException.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/Exception/SshLoginException.php
index e0ac134..5ad08ea 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/Exception/SshLoginException.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/Exception/SshLoginException.php
@@ -8,14 +8,16 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\GitCommands\Exception;
+use Exception;
+
/**
* InvalidArgumentException.
*
* @author Paul Schweppe
*/
-class SshLoginException extends \Exception implements ExceptionInterface
+class SshLoginException extends Exception implements ExceptionInterface
{
-
}
diff --git a/app/src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php b/app/src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php
new file mode 100644
index 0000000..35e9553
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php
@@ -0,0 +1,476 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands;
+
+use Doctrine\Common\Cache\CacheProvider;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Process\Exception\LogicException;
+use Symfony\Component\Process\Exception\RuntimeException;
+use Symfony\Component\Process\Process;
+use Symfony\Component\Process\ProcessBuilder;
+use Symfony\Component\Stopwatch\Stopwatch;
+use VersionControl\GitCommandBundle\GitCommands\Command\GitUserInterface;
+use VersionControl\GitCommandBundle\Service\SshProcessInterface;
+use VersionControl\GitCommandBundle\Service\SftpProcessInterface;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidArgumentException;
+use VersionControl\GitCommandBundle\Logger\GitCommandLogger;
+use VersionControl\GitCommandBundle\Event\GitAlterFilesEvent;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+
+/**
+ * @author Paul Schweppe
+ */
+class GitCommand
+{
+ /**
+ * @var string
+ */
+ protected $gitPath;
+
+ /**
+ * @var GitUserInterface
+ */
+ private $gitUser;
+
+ /**
+ * The git gitEnvironment entity.
+ *
+ * @var GitEnvironmentInterface
+ */
+ protected $gitEnvironment;
+
+ /**
+ * @var EventDispatcherInterface
+ */
+ public $dispatcher;
+
+ /**
+ * Git Command Logger.
+ *
+ * @var GitCommandLogger
+ */
+ protected $logger;
+
+ /**
+ * Symfony's debugging Stopwatch.
+ *
+ * @var Stopwatch|null
+ */
+ private $stopwatch;
+
+ /**
+ * SSH Process.
+ *
+ * @var SshProcessInterface
+ */
+ private $sshProcess;
+
+ /**
+ * Sftp Process.
+ *
+ * @var SftpProcessInterface
+ */
+ private $sftpProcess;
+
+ /**
+ * Cache in memory.
+ *
+ * @var CacheProvider
+ */
+ private $cache;
+
+ /**
+ * Last Exit code of local command.
+ *
+ * @var int
+ */
+ private $exitCode;
+
+ /**
+ * Wrapper function to run shell commands. Supports local and remote commands
+ * depending on the gitEnvironment details.
+ *
+ * @param string $command command to run
+ * @param bool $cacheCommand command to run
+ * @param bool $trim do not trim response. Maybe need for some command responses
+ *
+ * @return string Result of command
+ *
+ * @throws RuntimeException
+ * @throws LogicException
+ * @throws \RuntimeException
+ * @throws RunGitCommandException
+ */
+ public function runCommand($command, $cacheCommand = true, $trim = true): string
+ {
+ if ($this->stopwatch) {
+ $this->stopwatch->start('git_request', 'version_control');
+ }
+
+ $fullCommand = sprintf('cd %s && %s', $this->gitPath, $command);
+ $cacheId = md5($this->gitEnvironment->getId() . $fullCommand);
+
+ if ($this->gitEnvironment->getSsh() === false) {
+ //Run local commands
+ $start = microtime(true);
+ $response = $this->runLocalCommand($command);
+
+ $this->logCommand($fullCommand, 'local', array(), $start);
+
+ return $trim === true ? trim($response) : $response;
+ }
+
+ //Run remote command over ssh
+ if ($cacheCommand === true) {
+ $response = $this->cache->fetch($cacheId);
+ if ($response === false) {
+ $response = $this->runRemoteCommand($fullCommand);
+ $this->cache->save($cacheId, $response);
+ }
+ } else {
+ $response = $this->runRemoteCommand($fullCommand);
+ }
+
+ return $trim === true ? trim($response) : $response;
+ }
+
+ /**
+ * Run remote command over ssh.
+ *
+ * @param string $fullCommand
+ *
+ * @return string Commands response
+ */
+ private function runRemoteCommand($fullCommand): string
+ {
+ $start = microtime(true);
+
+ $this->sshProcess->run(
+ array($fullCommand),
+ $this->gitEnvironment->getHost(),
+ $this->gitEnvironment->getUsername(),
+ 22,
+ $this->gitEnvironment->getPassword(),
+ null,
+ $this->gitEnvironment->getPrivateKey(),
+ $this->gitEnvironment->getPrivateKeyPassword()
+ );
+
+ $this->logCommand(
+ $fullCommand,
+ 'remote',
+ array('host' => $this->gitEnvironment->getHost()),
+ $start,
+ $this->sshProcess->getStdout(),
+ $this->sshProcess->getStderr(),
+ $this->sshProcess->getExitStatus()
+ );
+
+ return $this->sshProcess->getStdout();
+ }
+
+ /**
+ * Run local command.
+ *
+ * @param string|array $command
+ *
+ * @return string Commands response
+ * @throws RuntimeException
+ * @throws RunGitCommandException
+ * @throws LogicException
+ * @throws RunGitCommandException
+ */
+ private function runLocalCommand($command)
+ {
+ $fullCommand = sprintf('cd %s && %s', $this->gitPath, $command);
+
+ //Run local commands
+ if (is_array($command)) {
+ //$finalCommands = array_merge(array('cd',$this->gitPath,'&&'),$command);
+ $builder = new ProcessBuilder($command);
+ $builder->setPrefix('cd ' . $this->gitPath . ' && ');
+ $process = $builder->getProcess();
+ } else {
+ $process = new Process($fullCommand);
+ }
+
+ //Run Proccess
+ $process->run();
+
+ $this->exitCode = $process->getExitCode();
+
+ $response = '';
+ // executes after the command finishes
+ if ($process->isSuccessful()) {
+ $response = $process->getOutput();
+ if (trim($process->getErrorOutput()) !== '') {
+ $response = $process->getErrorOutput();
+ }
+ } else {
+ if (trim($process->getErrorOutput()) !== '') {
+ throw new RunGitCommandException($process->getErrorOutput());
+ }
+ }
+
+ return $response;
+ }
+
+ public function getLastExitStatus()
+ {
+ if ($this->gitEnvironment->getSsh() === true) {
+ return $this->sshProcess->getExitStatus();
+ }
+
+ return $this->exitCode;
+ }
+
+ /**
+ * Gets the git path.
+ *
+ * @return string
+ */
+ public function getGitPath(): string
+ {
+ return $this->gitPath;
+ }
+
+ /**
+ * Sets the git path.
+ *
+ * @param string $gitPath
+ *
+ * @return GitCommand
+ */
+ protected function setGitPath(string $gitPath)
+ {
+ $this->gitPath = rtrim(trim($gitPath), DIRECTORY_SEPARATOR);
+
+ return $this;
+ }
+
+ /**
+ * Sets the Git Environment.
+ *
+ * @param GitEnvironmentInterface $gitEnvironment
+ *
+ * @return GitCommand
+ */
+ public function setGitEnvironment(GitEnvironmentInterface $gitEnvironment)
+ {
+ $this->gitEnvironment = $gitEnvironment;
+ $this->setGitPath($this->gitEnvironment->getPath());
+
+ return $this;
+ }
+
+ /**
+ * Allows you to override the git Environment.
+ *
+ * @param GitEnvironmentInterface $gitEnvironment
+ *
+ * @return GitCommand
+ */
+ public function overRideGitEnvironment(GitEnvironmentInterface $gitEnvironment)
+ {
+ $this->gitEnvironment = $gitEnvironment;
+ $this->setGitPath($this->gitEnvironment->getPath());
+
+ return $this;
+ }
+
+ /**
+ * Gets git Environment.
+ *
+ * @return GitEnvironmentInterface
+ */
+ public function getGitEnvironment()
+ {
+ return $this->gitEnvironment;
+ }
+
+ public function getDispatcher()
+ {
+ return $this->dispatcher;
+ }
+
+ public function setDispatcher(EventDispatcherInterface $dispatcher)
+ {
+ $this->dispatcher = $dispatcher;
+
+ return $this;
+ }
+
+ public function triggerGitAlterFilesEvent($eventName = 'git.alter_files')
+ {
+ $event = new GitAlterFilesEvent($this->gitEnvironment, array());
+ $this->dispatcher->dispatch($eventName, $event);
+ }
+
+ public function getLogger()
+ {
+ return $this->logger;
+ }
+
+ public function setLogger(GitCommandLogger $logger)
+ {
+ $this->logger = $logger;
+
+ return $this;
+ }
+
+ /**
+ * Sets a stopwatch instance for debugging purposes.
+ *
+ * @param Stopwatch $stopwatch
+ */
+ public function setStopwatch(Stopwatch $stopwatch = null)
+ {
+ $this->stopwatch = $stopwatch;
+ }
+
+ /**
+ * Log the query if we have an instance of ElasticaLogger.
+ *
+ * @param string $command
+ * @param string $method
+ * @param array $data
+ * @param int $start
+ * @param string $response
+ * @param string $error
+ * @param int $exitStatus
+ */
+ public function logCommand(
+ $command,
+ $method,
+ $data,
+ $start,
+ $response = '',
+ $error = '',
+ $exitStatus = 0
+ ) {
+ if (!$this->logger || !$this->logger instanceof GitCommandLogger) {
+ return;
+ }
+ $time = microtime(true) - $start;
+
+ $this->logger->logCommand($command, $method, $data, $time, $response, $error, $exitStatus);
+ }
+
+ /**
+ * Sets the SSH Process.
+ *
+ * @param SshProcessInterface $sshProcess
+ *
+ * @return GitCommand
+ */
+ public function setSshProcess(SshProcessInterface $sshProcess)
+ {
+ $this->sshProcess = $sshProcess;
+
+ return $this;
+ }
+
+ /**
+ * Sets the SFTP Process.
+ *
+ * @param SftpProcessInterface $sftpProcess
+ *
+ * @return GitCommand
+ */
+ public function setSftpProcess(SftpProcessInterface $sftpProcess)
+ {
+ $this->sftpProcess = $sftpProcess;
+
+ return $this;
+ }
+
+ /**
+ * Gets the SFTP Process.
+ *
+ * @return SftpProcessInterface
+ */
+ public function getSftpProcess()
+ {
+ $this->sftpProcess->setGitEnviroment($this->gitEnvironment);
+
+ return $this->sftpProcess;
+ }
+
+ public function setCache(CacheProvider $cache)
+ {
+ $this->cache = $cache;
+ }
+
+ /**
+ * Get git command groups.
+ *
+ * @param string $name
+ *
+ * @return Command\GitBranchCommand|Command\GitCommitCommand|Command\GitDiffCommand|Command\GitFilesCommand|Command\GitInitCommand|Command\GitLogCommand|Command\GitTagCommand
+ *
+ * @throws InvalidArgumentException
+ */
+ public function command($name)
+ {
+ switch (trim($name)) {
+ case 'branch':
+ $command = new Command\GitBranchCommand($this);
+ break;
+ case 'tag':
+ $command = new Command\GitTagCommand($this);
+ break;
+ case 'commit':
+ $command = new Command\GitCommitCommand($this);
+ break;
+ case 'diff':
+ $command = new Command\GitDiffCommand($this);
+ break;
+ case 'files':
+ $command = new Command\GitFilesCommand($this);
+ break;
+ case 'init':
+ $command = new Command\GitInitCommand($this);
+ break;
+ case 'log':
+ $command = new Command\GitLogCommand($this);
+ break;
+ case 'status':
+ $command = new Command\GitStatusCommand($this);
+ break;
+ case 'sync':
+ $command = new Command\GitSyncCommand($this);
+ break;
+ case 'undo':
+ $command = new Command\GitUndoCommand($this);
+ break;
+ default:
+ throw new InvalidArgumentException(sprintf('Unknown command instance called: "%s"', $name));
+ }
+
+ return $command;
+ }
+
+ /**
+ * @return GitUserInterface
+ */
+ public function getGitUser(): GitUserInterface
+ {
+ return $this->gitUser;
+ }
+
+ /**
+ * @param GitUserInterface $gitUser
+ */
+ public function setGitUser(GitUserInterface $gitUser): void
+ {
+ $this->gitUser = $gitUser;
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/GitDiffParser.php b/app/src/VersionControl/GitCommandBundle/GitCommands/GitDiffParser.php
similarity index 68%
rename from src/VersionControl/GitCommandBundle/GitCommands/GitDiffParser.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/GitDiffParser.php
index 629d407..a3c7fb0 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/GitDiffParser.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/GitDiffParser.php
@@ -1,142 +1,142 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands;
-
-use VersionControl\GitCommandBundle\Entity\GitDiff;
-use VersionControl\GitCommandBundle\Entity\GitDiffLine;
-
-/**
- * Parses git diff command response
- *
- * @author Paul Schweppe
- */
-class GitDiffParser {
-
- protected $lines;
-
- protected $lineCount;
-
-
- /**
- * @param string $string
- * @return Diff[]
- */
- public function __construct($string)
- {
- $this->lines = $this->splitOnNewLine($string, false);
- $this->lineCount = count($this->lines);
-
- }
-
- public function parse(){
-
- $diffs = array();
- $diff = null;
- $collected = array();
-
- for ($i = 0; $i < $this->lineCount; ++$i) {
- if (preg_match('(^---\\s+(?P.+))', $this->lines[$i], $matchFileA) &&
- preg_match('(^\\+\\+\\+\\s+(?P.+))', $this->lines[$i + 1], $matchFileB)) {
-
-
- //Second iteration
- if(count($collected) > 0 && count($diffs) > 0){
- $lastDiff = end($diffs);
- $diffLines = $this->parseDiffLines($collected);
- $lastDiff->setDiffLines($diffLines);
- reset($diffs);
- }
-
- //All iteration
- $diff = new GitDiff();
- $diff->setFileA($matchFileA['file']);
- $diff->setFileB($matchFileB['file']);
- $diffs[] = $diff;
-
- $collected = array();
-
- ++$i;
-
- if($i >= 300000){
- break;
- }
- } else {
- if (preg_match('/^(?:diff --git |index [\da-f\.]+|[+-]{3} [ab])/', $this->lines[$i])) {
- continue;
- }
- $collected[] = $this->lines[$i];
- }
- }
-
- if(count($collected) > 0 && count($diffs) > 0){
- $lastDiff = end($diffs);
- $diffLines = $this->parseDiffLines($collected);
- $lastDiff->setDiffLines($diffLines);
- reset($diffs);
- }
-
- return $diffs;
- }
-
- /**
- * @param Diff $diff
- * @param array $lines
- */
- private function parseDiffLines(array $lines)
- {
- $section = array();
- $diffLines = array();
- $lineNumber = 0;
- foreach ($lines as $line) {
- $diffLine = new GitDiffLine($line);
- if (preg_match('/^@@\s+-(?P\d+)(?:,\s*(?P\d+))?\s+\+(?P\d+)(?:,\s*(?P\d+))?\s+@@/', $line, $match)) {
- $section = array(
- $match['start'],
- isset($match['startrange']) ? max(1, $match['startrange']) : 1,
- $match['end'],
- isset($match['endrange']) ? max(1, $match['endrange']) : 1
- );
- $diffLine->setLineNumber('...');
- $lineNumber = $match['start'];
- }else{
- if($diffLine->getType() === GitDiffLine::REMOVED){
- $diffLine->setLineNumber('');
- }else{
- $diffLine->setLineNumber($lineNumber);
- $lineNumber++;
- }
- }
- $diffLines[] = $diffLine;
- }
-
- return $diffLines;
- }
-
- /**
- * Splits a block of text on newlines and returns an array
- *
- * @param string $text Text to split
- * @param boolean $trimSpaces If true then each line is trimmed of white spaces. Default true.
- * @return array Array of lines
- */
- protected function splitOnNewLine($text,$trimSpaces = true){
- if(!trim($text)){
- return array();
- }
- $lines = preg_split('/$\R?^/m', $text);
- if($trimSpaces){
- return array_map('trim',$lines);
- }else{
- return $lines;
- }
- }
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\GitCommands;
+
+use VersionControl\GitCommandBundle\Entity\GitDiff;
+use VersionControl\GitCommandBundle\Entity\GitDiffLine;
+
+/**
+ * Parses git diff command response.
+ *
+ * @author Paul Schweppe
+ */
+class GitDiffParser
+{
+ protected $lines;
+
+ protected $lineCount;
+
+ /**
+ * @param string $string
+ */
+ public function __construct($string)
+ {
+ $this->lines = $this->splitOnNewLine($string, false);
+ $this->lineCount = count($this->lines);
+ }
+
+ public function parse()
+ {
+ $diffs = array();
+ $diff = null;
+ $collected = array();
+
+ for ($i = 0; $i < $this->lineCount; ++$i) {
+ if (preg_match('(^---\\s+(?P.+))', $this->lines[$i], $matchFileA) &&
+ preg_match('(^\\+\\+\\+\\s+(?P.+))', $this->lines[$i + 1], $matchFileB)) {
+
+ //Second iteration
+ if (count($collected) > 0 && count($diffs) > 0) {
+ $lastDiff = end($diffs);
+ $diffLines = $this->parseDiffLines($collected);
+ $lastDiff->setDiffLines($diffLines);
+ reset($diffs);
+ }
+
+ //All iteration
+ $diff = new GitDiff();
+ $diff->setFileA($matchFileA['file']);
+ $diff->setFileB($matchFileB['file']);
+ $diffs[] = $diff;
+
+ $collected = array();
+
+ ++$i;
+
+ if ($i >= 300000) {
+ break;
+ }
+ } else {
+ if (preg_match('/^(?:diff --git |index [\da-f\.]+|[+-]{3} [ab])/', $this->lines[$i])) {
+ continue;
+ }
+ $collected[] = $this->lines[$i];
+ }
+ }
+
+ if (count($collected) > 0 && count($diffs) > 0) {
+ $lastDiff = end($diffs);
+ $diffLines = $this->parseDiffLines($collected);
+ $lastDiff->setDiffLines($diffLines);
+ reset($diffs);
+ }
+
+ return $diffs;
+ }
+
+ /**
+ * @param array $lines
+ *
+ * @return array
+ */
+ private function parseDiffLines(array $lines)
+ {
+ $section = array();
+ $diffLines = array();
+ $lineNumber = 0;
+ foreach ($lines as $line) {
+ $diffLine = new GitDiffLine($line);
+ if (preg_match('/^@@\s+-(?P\d+)(?:,\s*(?P\d+))?\s+\+(?P\d+)(?:,\s*(?P\d+))?\s+@@/', $line, $match)) {
+ $section = array(
+ $match['start'],
+ isset($match['startrange']) ? max(1, $match['startrange']) : 1,
+ $match['end'],
+ isset($match['endrange']) ? max(1, $match['endrange']) : 1,
+ );
+ $diffLine->setLineNumber('...');
+ $lineNumber = $match['start'];
+ } else {
+ if ($diffLine->getType() === GitDiffLine::REMOVED) {
+ $diffLine->setLineNumber('');
+ } else {
+ $diffLine->setLineNumber($lineNumber);
+ ++$lineNumber;
+ }
+ }
+ $diffLines[] = $diffLine;
+ }
+
+ return $diffLines;
+ }
+
+ /**
+ * Splits a block of text on newlines and returns an array.
+ *
+ * @param string $text Text to split
+ * @param bool $trimSpaces If true then each line is trimmed of white spaces. Default true
+ *
+ * @return array Array of lines
+ */
+ protected function splitOnNewLine($text, $trimSpaces = true)
+ {
+ if (!trim($text)) {
+ return array();
+ }
+ $lines = preg_split('/$\R?^/m', $text);
+ if ($trimSpaces) {
+ return array_map('trim', $lines);
+ }
+
+ return $lines;
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/GitEnvironmentInterface.php b/app/src/VersionControl/GitCommandBundle/GitCommands/GitEnvironmentInterface.php
similarity index 66%
rename from src/VersionControl/GitCommandBundle/GitCommands/GitEnvironmentInterface.php
rename to app/src/VersionControl/GitCommandBundle/GitCommands/GitEnvironmentInterface.php
index 0cdf62b..ec09dfb 100644
--- a/src/VersionControl/GitCommandBundle/GitCommands/GitEnvironmentInterface.php
+++ b/app/src/VersionControl/GitCommandBundle/GitCommands/GitEnvironmentInterface.php
@@ -12,68 +12,69 @@
namespace VersionControl\GitCommandBundle\GitCommands;
/**
- * Interface to the Git Environment. Implement to object to
- * store location of git path and ssh details
+ * Interface to the Git Environment. Implement to object to
+ * store location of git path and ssh details.
*
* @author Paul Schweppe
*/
-interface GitEnvironmentInterface {
-
+interface GitEnvironmentInterface
+{
/**
- * Unique identifier
+ * Unique identifier.
*/
public function getId();
-
/**
- * Get Path to git folder
+ * Get Path to git folder.
*/
public function getPath();
-
/**
- * Get SSH value, true or false to use SSH
- * @return boolean
+ * Get SSH value, true or false to use SSH.
+ *
+ * @return bool
*/
public function getSsh();
-
/**
- * Get SSH host
+ * Get SSH host.
+ *
* @return string
*/
public function getHost();
-
+
/**
- * Get SSH host
+ * Get SSH host.
+ *
* @return string
*/
public function getPort();
-
/**
- * Get SSH username
+ * Get SSH username.
+ *
* @return string
*/
public function getUsername();
-
/**
- * Get SSH password
+ * Get SSH password.
+ *
* @return string
*/
public function getPassword();
-
+
/**
- * Get Private Key Content
+ * Get Private Key Content.
+ *
* @return string
*/
public function getPrivateKey();
-
+
/**
- * Get Private Key Password
+ * Get Private Key Password.
+ *
* @return string
*/
public function getPrivateKeyPassword();
-
}
diff --git a/src/VersionControl/GitCommandBundle/Logger/GitCommandLogger.php b/app/src/VersionControl/GitCommandBundle/Logger/GitCommandLogger.php
similarity index 67%
rename from src/VersionControl/GitCommandBundle/Logger/GitCommandLogger.php
rename to app/src/VersionControl/GitCommandBundle/Logger/GitCommandLogger.php
index a92b84f..a9227b3 100644
--- a/src/VersionControl/GitCommandBundle/Logger/GitCommandLogger.php
+++ b/app/src/VersionControl/GitCommandBundle/Logger/GitCommandLogger.php
@@ -10,7 +10,7 @@
namespace VersionControl\GitCommandBundle\Logger;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use \Psr\Log\LoggerInterface;
/**
* Logger for the git commands.
@@ -19,14 +19,26 @@
*/
class GitCommandLogger
{
+ /**
+ * @var LoggerInterface
+ */
protected $logger;
+
+ /**
+ * @var array
+ */
protected $commands;
+
+ /**
+ * @var bool
+ */
protected $debug;
/**
* Constructor.
*
* @param LoggerInterface $logger The Symfony logger
+ * @param bool $debug
*/
public function __construct(LoggerInterface $logger = null, $debug = false)
{
@@ -38,15 +50,15 @@ public function __construct(LoggerInterface $logger = null, $debug = false)
/**
* Logs a git command.
*
- * @param string $command Git command called
+ * @param string $command Git command called
* @param string $method Local or remote command
- * @param array $data arguments
- * @param float $time execution time
- * @param string $response execution time
- * @param string $error execution time
- * @param int $exitStatus execution time
+ * @param array $data arguments
+ * @param float $time execution time
+ * @param string $response execution time
+ * @param string $error execution time
+ * @param int $exitStatus execution time
*/
- public function logCommand($command, $method, $data, $time, $response='', $error='', $exitStatus=0)
+ public function logCommand($command, $method, $data, $time, $response = '', $error = '', $exitStatus = 0)
{
if ($this->debug) {
$this->commands[] = array(
@@ -56,22 +68,22 @@ public function logCommand($command, $method, $data, $time, $response='', $error
'executionMS' => $time,
'response' => $response,
'error' => $error,
- 'exitStatus' => $exitStatus
+ 'exitStatus' => $exitStatus,
);
}
if (null !== $this->logger) {
- $message = sprintf("%s (%s) %0.2f ms", $command, $method, $time * 1000);
- $this->logger->info($message, (array) $data);
+ $message = sprintf('%s (%s) %0.2f ms', $command, $method, $time * 1000);
+ $this->logger->info($message, (array)$data);
}
}
/**
* Returns the number of git commands that have been logged.
*
- * @return integer The number of commands logged
+ * @return int The number of commands logged
*/
- public function getCommandsCount()
+ public function getCommandsCount(): int
{
return count($this->commands);
}
@@ -81,7 +93,7 @@ public function getCommandsCount()
*
* @return array An array of git commands
*/
- public function getCommands()
+ public function getCommands(): array
{
return $this->commands;
}
diff --git a/src/VersionControl/GitCommandBundle/Profiler/GitCommandCollector.php b/app/src/VersionControl/GitCommandBundle/Profiler/GitCommandCollector.php
similarity index 93%
rename from src/VersionControl/GitCommandBundle/Profiler/GitCommandCollector.php
rename to app/src/VersionControl/GitCommandBundle/Profiler/GitCommandCollector.php
index 00be586..e539366 100644
--- a/src/VersionControl/GitCommandBundle/Profiler/GitCommandCollector.php
+++ b/app/src/VersionControl/GitCommandBundle/Profiler/GitCommandCollector.php
@@ -8,32 +8,33 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\Profiler;
+use Exception;
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
use VersionControl\GitCommandBundle\Logger\GitCommandLogger;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
- * Profile for git commands. View git commands for a request in the Symfony2 dev profiler
- *
+ * Profile for git commands. View git commands for a request in the Symfony2 dev profiler.
+ *
* @author Paul Schweppe
*/
class GitCommandCollector extends DataCollector
{
/**
- *
- * @var GitCommandLogger
+ * @var GitCommandLogger
*/
protected $logger;
-
+
public function __construct(GitCommandLogger $logger)
{
$this->logger = $logger;
}
-
- public function collect(Request $request, Response $response, \Exception $exception = null)
+
+ public function collect(Request $request, Response $response, Exception $exception = null)
{
$this->data['commands_count'] = $this->logger->getCommandsCount();
$this->data['commands'] = $this->logger->getCommands();
@@ -48,7 +49,7 @@ public function getCommandsCount()
{
return $this->data['commands_count'];
}
-
+
public function getTime()
{
$time = 0;
@@ -59,10 +60,8 @@ public function getTime()
return $time;
}
-
public function getName()
{
return 'version_control.gitcommand_collector';
}
}
-
diff --git a/src/VersionControl/GitCommandBundle/Resources/config/services.yml b/app/src/VersionControl/GitCommandBundle/Resources/config/services.yml
similarity index 56%
rename from src/VersionControl/GitCommandBundle/Resources/config/services.yml
rename to app/src/VersionControl/GitCommandBundle/Resources/config/services.yml
index d319490..85db16e 100644
--- a/src/VersionControl/GitCommandBundle/Resources/config/services.yml
+++ b/app/src/VersionControl/GitCommandBundle/Resources/config/services.yml
@@ -1,21 +1,20 @@
-
+
services:
version_control.ssh_process:
class: VersionControl\GitCommandBundle\Service\SecLibSshProcess
-
+
version_control.sftp_process:
class: VersionControl\GitCommandBundle\Service\SecLibSftpProcess
-
- version_control.git_commands:
- class: VersionControl\GitCommandBundle\GitCommands\GitCommand
- calls:
- #- [setSecurityContext, ["@security.token_storage"]]
- - [setDispatcher, ["@event_dispatcher"]]
- - [setLogger, ["@version_control.logger"]]
- - [setSshProcess, ["@version_control.ssh_process"]]
- - [setSftpProcess, ["@version_control.sftp_process"]]
- - [setCache, ["@array_cache"]]
-
+
+# version_control.git_commands:
+# class: VersionControl\GitCommandBundle\GitCommands\GitCommand
+# calls:
+# - [setDispatcher, ["@event_dispatcher"]]
+# - [setLogger, ["@version_control.logger"]]
+# - [setSshProcess, ["@version_control.ssh_process"]]
+# - [setSftpProcess, ["@version_control.sftp_process"]]
+# - [setCache, ["@array_cache"]]
+
version_control.gitcommand_collector:
class: VersionControl\GitCommandBundle\Profiler\GitCommandCollector
tags:
@@ -26,21 +25,21 @@ services:
#priority: 300
public: false
arguments:
- - @version_control.logger
-
-
- version_control.logger:
+ - '@version_control.logger'
+
+
+ version_control.logger:
class: VersionControl\GitCommandBundle\Logger\GitCommandLogger
arguments:
- - @logger
+ - '@logger'
- %kernel.debug%
tags:
- - { name: monolog.logger, channel: 'gitcommand' }
-
+ - { name: monolog.logger, channel: 'gitcommand' }
+
version_control.twig.versioncommand_isignored:
class: VersionControl\GitCommandBundle\Twig\Extension\IsIgnoredExtension
tags:
- { name: twig.extension }
arguments:
- - @version_control.git_commands
-
+ - '@version_control.git_commands'
+
diff --git a/src/VersionControl/GitCommandBundle/Resources/views/Profiler/GitCommand.html.twig b/app/src/VersionControl/GitCommandBundle/Resources/views/Profiler/GitCommand.html.twig
similarity index 100%
rename from src/VersionControl/GitCommandBundle/Resources/views/Profiler/GitCommand.html.twig
rename to app/src/VersionControl/GitCommandBundle/Resources/views/Profiler/GitCommand.html.twig
diff --git a/src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php b/app/src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php
similarity index 53%
rename from src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php
rename to app/src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php
index ff6c7a8..b228043 100644
--- a/src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php
+++ b/app/src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php
@@ -11,156 +11,199 @@
namespace VersionControl\GitCommandBundle\Service;
+use InvalidArgumentException;
use phpseclib\Net\SFTP;
use phpseclib\Crypt\RSA;
+use RuntimeException;
use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
use VersionControl\GitCommandBundle\GitCommands\Exception\SshLoginException;
/**
* Use PhpSecLib to make SFTP requests. This is a wrapper for some of the functions
- * of PhpSecLib
+ * of PhpSecLib.
*
* @link https://github.com/phpseclib/phpseclib
+ *
* @author Paul Schweppe
*/
-class SecLibSftpProcess implements SftpProcessInterface {
-
+class SecLibSftpProcess implements SftpProcessInterface
+{
/**
- * SFTP connection
+ * SFTP connection.
+ *
* @var phpseclib\Net\SFTP
*/
- protected $sftp = null;
-
+ protected $sftp;
+
/**
- * The git environment with connection details
- * @var VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface
+ * The git environment with connection details.
+ *
+ * @var VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface
*/
protected $gitEnvironment;
-
- public function setGitEnviroment(GitEnvironmentInterface $gitEnvironment){
- if(!$gitEnvironment->getSsh()){
- throw new \Exception('This Git Environment does not use SSH');
+ public function setGitEnviroment(GitEnvironmentInterface $gitEnvironment)
+ {
+ if (!$gitEnvironment->getSsh()) {
+ throw new RuntimeException('This Git Environment does not use SSH');
}
$this->gitEnvironment = $gitEnvironment;
}
-
+
/**
- * Connects to remote server
- *
- * @throws \InvalidArgumentException|\RuntimeException
- * @return void
+ * Connects to remote server.
+ *
+ * @throws SshLoginException
+ * @throws InvalidArgumentException|RuntimeException
*/
protected function connect()
{
$host = $this->gitEnvironment->getHost();
- $username = $this->gitEnvironment->getUsername();
+ $username = $this->gitEnvironment->getUsername();
$port = $this->gitEnvironment->getPort();
- $password = $this->gitEnvironment->getPassword();
+ $password = $this->gitEnvironment->getPassword();
$privateKey = $this->gitEnvironment->getPrivateKey();
$privateKeyPassword = $this->gitEnvironment->getPrivateKeyPassword();
-
+
$this->sftp = new SFTP($host, 22);
-
- if(!$this->sftp){
+
+ if (!$this->sftp) {
throw new SshLoginException(sprintf('SSH connection failed on "%s:%s"', $host, $port));
}
if (isset($username) && $privateKey != null) {
- $key = new RSA();
+ $key = new RSA();
//Set Private Key Password
- if($privateKeyPassword){
+ if ($privateKeyPassword) {
$key->setPassword($privateKeyPassword);
}
- $key->loadKey($privateKey);
+ $key->loadKey($privateKey);
//Login using private key
- if (!$this->sftp->login($username, $key)) {
+ if (!$this->sftp->login($username, $key)) {
throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using private key', $username));
}
-
- }else{
- if(!$this->sftp->login($username, $password)) {
+ } else {
+ if (!$this->sftp->login($username, $password)) {
throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using password', $username));
}
}
-
}
-
+
/**
- * Gets the SFTP. Checks if connection already exists
+ * Gets the SFTP. Checks if connection already exists.
+ *
* @return phpseclib\Net\SFTP
+ * @throws SshLoginException
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
*/
- protected function getSFTP(){
- if(!$this->sftp){
+ protected function getSFTP()
+ {
+ if (!$this->sftp) {
$this->connect();
}
+
return $this->sftp;
}
-
+
/**
- * Gets all files in a directory
+ * Gets all files in a directory.
+ *
* @param string $path
+ *
* @return array
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
+ * @throws SshLoginException
*/
- public function getDirectoryList($path){
+ public function getDirectoryList($path)
+ {
return $this->getSFTP()->rawlist($path);
}
-
+
/**
- * Check if file exists
+ * Check if file exists.
+ *
* @param string $filePath
- * @return boolean
+ *
+ * @return bool
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
+ * @throws SshLoginException
*/
- public function fileExists($filePath){
+ public function fileExists($filePath)
+ {
return $this->getSFTP()->file_exists($filePath);
}
-
+
/**
- * Gets files stats
+ * Gets files stats.
+ *
* @param string $filePath
+ *
* @return array
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
+ * @throws SshLoginException
*/
- public function getFileStats($filePath){
+ public function getFileStats($filePath)
+ {
return $this->getSFTP()->stat($filePath);
}
-
+
/**
- * Gets file contents
+ * Gets file contents.
+ *
* @param string $filePath
+ *
* @return string
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
+ * @throws SshLoginException
*/
- public function getFileContents($filePath){
+ public function getFileContents($filePath)
+ {
return $this->getSFTP()->get($filePath);
}
-
+
/**
- * Checks if file is a directory
+ * Checks if file is a directory.
+ *
* @param string $filePath
- * @return boolean
+ *
+ * @return bool
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
+ * @throws SshLoginException
*/
- public function isDir($filePath){
+ public function isDir($filePath)
+ {
return $this->getSFTP()->is_dir($filePath);
}
-
+
/**
- *
- * @param string $filePahh
+ * @param $filePath
* @param string $content
+ *
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
+ * @throws SshLoginException
*/
- public function appendToFile($filePath,$content){
+ public function appendToFile($filePath, $content)
+ {
//echo "hello" >>
$this->getSFTP()->put($filePath, $content, SFTP::RESUME);
}
-
+
/**
- * Disconnect from SFTP
+ * Disconnect from SFTP.
*/
- public function disconnect(){
+ public function disconnect()
+ {
$this->sftp->disconnect();
$this->sftp = null;
}
-
}
diff --git a/src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php b/app/src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php
similarity index 52%
rename from src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php
rename to app/src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php
index d70c86f..75cfb68 100644
--- a/src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php
+++ b/app/src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php
@@ -1,220 +1,250 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Service;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use VersionControl\GitCommandBundle\Service\SshProcessInterface;
-use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
-
-use phpseclib\Net\SSH2;
-use phpseclib\Crypt\RSA;
-/**
- * Use PhpSecLib to make SSH2 requests
- *
- * @link https://github.com/phpseclib/phpseclib
- * @author Paul Schweppe
- */
-class SecLibSshProcess implements SshProcessInterface
-{
-
-
- /**
- * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
- */
- protected $dispatcher;
-
- /**
- * @var array
- */
- protected $config;
-
- /**
- * @var resource
- */
- protected $shell;
-
- /**
- * @var array
- */
- protected $stdout;
-
- /**
- * @var array
- */
- protected $stderr;
-
- /**
- * //EventDispatcherInterface $eventDispatcher,
- * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
- * @param array $config
- */
- public function __construct()
- {
- $this->shell = null;
- $this->stdout = array();
- $this->stdin = array();
- $this->stderr = array();
- }
-
- /**
- * @param string $glue
- * @return array|string
- */
- public function getStdout($glue = "\n")
- {
- if (!$glue) {
- $output = $this->stdout;
- }else{
- $output = implode($glue, $this->stdout);
- }
-
- return $output;
- }
-
- /**
- * @param string $glue
- * @return array|string
- */
- public function getStderr($glue = "\n")
- {
- if (!$glue) {
- return $this->stderr;
- }
-
- return implode($glue, $this->stderr);
- }
-
- /**
- *
- * @param array $commands
- * @param string $host
- * @param string $username
- * @param integer $port
- * @param string $password
- * @param string $pubkeyFile
- * @param string $privkeyFile
- * @param string $passphrase
- * @return type
- */
- public function run(array $commands,$host,$username,$port=22,$password=null,$pubkeyFile=null,$privkeyFile=null,$passphrase=NULL)
- {
- $this->reset();
-
- if($this->shell === NULL){
- $this->connect($host,$username,$port,$password,$pubkeyFile,$privkeyFile,$passphrase);
- }
-
- foreach ($commands as $command) {
- $this->execute($command);
- }
-
- //$this->disconnect();
-
- return $this->stdout;
- }
-
- /**
- * Resets out puts for next command
- */
- protected function reset(){
- $this->stdout = array();
- $this->stdin = array();
- $this->stderr = array();
- }
-
- /**
- * @throws \InvalidArgumentException|\RuntimeException
- * @param array $connection
- * @return void
- */
- protected function connect($host,$username,$port=22,$password=null,$pubkeyFile=null,$privateKey=null,$privateKeyPassword=NULL)
- {
- $this->shell = new SSH2($host,$port);
-
- if (!$this->shell) {
- throw new \InvalidArgumentException(sprintf('SSH connection failed on "%s:%s"', $host, $port));
- }
-
- if (isset($username) && trim($privateKey)) {
- $key = new RSA();
- if($privateKeyPassword){
- $key->setPassword($privateKeyPassword);
- }
- $key->loadKey($privateKey);
- if (!$this->shell->login($username, $key)) {
- throw new \InvalidArgumentException(sprintf('SSH authentication failed for user "%s" using private key', $username, $pubkeyFile));
- }
- } else if ($username && $password) {
- if (!$this->shell->login($username, $password)) {
- throw new \InvalidArgumentException(sprintf('SSH authentication failed for user "%s"', $username));
- }
- }
- $this->shell->getServerPublicHostKey();
-
- $this->stdout = array();
- $this->stdin = array();
- }
-
- /**
- * @return void
- */
- public function disconnect()
- {
- if($this->shell){
- //$this->shell->disconnect();
- }
- }
-
- /**
- * @param array $command
- * @return void
- */
- protected function execute($command)
- {
-
- $this->shell->enableQuietMode();
-
- $stdOutput = $this->shell->exec($command);
- $stdError = $this->shell->getStdError();
- $exitStatus = $this->shell->getExitStatus();
-
- $stdout = explode("\n", $stdOutput);
- $stderr = array_filter(explode("\n", $stdError));
-
-
- if ($exitStatus != 0) {
- //print_r($stderr);
- throw new RunGitCommandException(sprintf("Error in command shell:%s \n Error Response:%s%s",$command,implode("\n", $stderr),$stdOutput));
- }
-
- $this->stdout = array_merge($this->stdout, $stdout);
-
- if (is_array($stderr)) {
- $this->stderr = array_merge($this->stderr, $stderr);
-
- if($exitStatus === 0){
- $this->stdout = array_merge($this->stdout, $stderr);
- }
-
- }
- }
-
- public function getExitStatus(){
- return $this->shell->getExitStatus();
- }
-
- public function __destruct() {
- $this->disconnect();
- }
-
-}
-
-
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Service;
+
+use InvalidArgumentException;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use phpseclib\Net\SSH2;
+use phpseclib\Crypt\RSA;
+
+/**
+ * Use PhpSecLib to make SSH2 requests.
+ *
+ * @link https://github.com/phpseclib/phpseclib
+ *
+ * @author Paul Schweppe
+ */
+class SecLibSshProcess implements SshProcessInterface
+{
+ /**
+ * @var EventDispatcherInterface
+ */
+ protected $dispatcher;
+
+ /**
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * @var SSH2|null
+ */
+ protected $shell;
+
+ /**
+ * @var array
+ */
+ protected $stdout;
+
+ /**
+ * @var array
+ */
+ protected $stderr;
+
+ /**
+ * //EventDispatcherInterface $eventDispatcher,.
+ *
+ */
+ public function __construct()
+ {
+ $this->shell = null;
+ $this->stdout = array();
+ $this->stdin = array();
+ $this->stderr = array();
+ }
+
+ /**
+ * @param string $glue
+ *
+ * @return array|string
+ */
+ public function getStdout($glue = "\n")
+ {
+ if (!$glue) {
+ $output = $this->stdout;
+ } else {
+ $output = implode($glue, $this->stdout);
+ }
+
+ return $output;
+ }
+
+ /**
+ * @param string $glue
+ *
+ * @return array|string
+ */
+ public function getStderr($glue = "\n")
+ {
+ if (!$glue) {
+ return $this->stderr;
+ }
+
+ return implode($glue, $this->stderr);
+ }
+
+ /**
+ * @param array $commands
+ * @param string $host
+ * @param string $username
+ * @param int $port
+ * @param string $password
+ * @param string|null $publicKeyFile
+ * @param string|null $privateKeyFile
+ * @param string $passphrase
+ *
+ * @return array
+ * @throws RunGitCommandException
+ */
+ public function run(
+ array $commands,
+ string $host,
+ string $username,
+ int $port = 22,
+ ?string $password = null,
+ ?string $publicKeyFile = null,
+ ?string $privateKeyFile = null,
+ ?string $passphrase = null
+ ): array {
+ $this->reset();
+
+ if ($this->shell === null) {
+ $this->connect($host, $username, $port, $password, $pubkeyFile, $privkeyFile, $passphrase);
+ }
+
+ foreach ($commands as $command) {
+ $this->execute($command);
+ }
+
+ //$this->disconnect();
+
+ return $this->stdout;
+ }
+
+ /**
+ * Resets out puts for next command.
+ */
+ protected function reset()
+ {
+ $this->stdout = array();
+ $this->stdin = array();
+ $this->stderr = array();
+ }
+
+ /**
+ * @param $host
+ * @param $username
+ * @param int $port
+ * @param null $password
+ * @param null $pubkeyFile
+ * @param null $privateKey
+ * @param null $privateKeyPassword
+ *
+ * @throws InvalidArgumentException
+ */
+ protected function connect(
+ $host,
+ $username,
+ $port = 22,
+ $password = null,
+ $pubkeyFile = null,
+ $privateKey = null,
+ $privateKeyPassword = null
+ ) {
+ $this->shell = new SSH2($host, $port);
+
+ if (!$this->shell) {
+ throw new InvalidArgumentException(sprintf('SSH connection failed on "%s:%s"', $host, $port));
+ }
+
+ if (isset($username) && trim($privateKey)) {
+ $key = new RSA();
+ if ($privateKeyPassword) {
+ $key->setPassword($privateKeyPassword);
+ }
+ $key->loadKey($privateKey);
+ if (!$this->shell->login($username, $key)) {
+ throw new InvalidArgumentException(sprintf('SSH authentication failed for user "%s" using private key',
+ $username, $pubkeyFile));
+ }
+ } elseif ($username && $password) {
+ if (!$this->shell->login($username, $password)) {
+ throw new InvalidArgumentException(sprintf('SSH authentication failed for user "%s"', $username));
+ }
+ }
+ $this->shell->getServerPublicHostKey();
+
+ $this->stdout = array();
+ $this->stdin = array();
+ }
+
+ public function disconnect()
+ {
+ if ($this->shell) {
+ //$this->shell->disconnect();
+ }
+ }
+
+ /**
+ * @param array $command
+ *
+ * @throws RunGitCommandException
+ */
+ protected function execute($command)
+ {
+ $this->shell->enableQuietMode();
+
+ $stdOutput = $this->shell->exec($command);
+ $stdError = $this->shell->getStdError();
+ $exitStatus = $this->shell->getExitStatus();
+
+ $stdout = explode("\n", $stdOutput);
+ $stderr = array_filter(explode("\n", $stdError));
+
+ if ($exitStatus != 0) {
+ //print_r($stderr);
+ throw new RunGitCommandException(
+ sprintf(
+ "Error in command shell:%s \n Error Response:%s%s",
+ $command,
+ implode("\n", $stderr),
+ $stdOutput
+ )
+ );
+ }
+
+ $this->stdout = array_merge($this->stdout, $stdout);
+
+ if (is_array($stderr)) {
+ $this->stderr = array_merge($this->stderr, $stderr);
+
+ if ($exitStatus === 0) {
+ $this->stdout = array_merge($this->stdout, $stderr);
+ }
+ }
+ }
+
+ /**
+ * Get exit status
+ * @return false|int
+ */
+ public function getExitStatus()
+ {
+ return $this->shell->getExitStatus();
+ }
+
+ public function __destruct()
+ {
+ $this->disconnect();
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/Service/SftpProcessInterface.php b/app/src/VersionControl/GitCommandBundle/Service/SftpProcessInterface.php
similarity index 73%
rename from src/VersionControl/GitCommandBundle/Service/SftpProcessInterface.php
rename to app/src/VersionControl/GitCommandBundle/Service/SftpProcessInterface.php
index 99338a9..f3be35c 100644
--- a/src/VersionControl/GitCommandBundle/Service/SftpProcessInterface.php
+++ b/app/src/VersionControl/GitCommandBundle/Service/SftpProcessInterface.php
@@ -1,66 +1,78 @@
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\Service;
use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
/**
- * Interface for SFTP Process
+ * Interface for SFTP Process.
*
* @author Paul Schweppe
*/
-interface SftpProcessInterface {
-
+interface SftpProcessInterface
+{
/**
- * Set Git Environment
+ * Set Git Environment.
+ *
* @param GitEnvironmentInterface $gitEnvironment
*/
public function setGitEnviroment(GitEnvironmentInterface $gitEnvironment);
-
+
/**
- * Gets all files in a directory
+ * Gets all files in a directory.
+ *
* @param string $path
+ *
* @return array
*/
public function getDirectoryList($path);
-
+
/**
- * Check if file exists
+ * Check if file exists.
+ *
* @param string $filePath
- * @return boolean
+ *
+ * @return bool
*/
public function fileExists($filePath);
-
+
/**
- * Gets files stats
+ * Gets files stats.
+ *
* @param string $filePath
+ *
* @return array
*/
public function getFileStats($filePath);
-
+
/**
- * Gets file contents
+ * Gets file contents.
+ *
* @param string $filePath
+ *
* @return string
*/
public function getFileContents($filePath);
-
+
/**
- * Checks if file is a directory
+ * Checks if file is a directory.
+ *
* @param string $filePath
- * @return boolean
+ *
+ * @return bool
*/
public function isDir($filePath);
-
+
/**
- * Disconnect from SFTP
+ * Disconnect from SFTP.
*/
public function disconnect();
}
diff --git a/app/src/VersionControl/GitCommandBundle/Service/SshProcess.php b/app/src/VersionControl/GitCommandBundle/Service/SshProcess.php
new file mode 100644
index 0000000..05c66eb
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Service/SshProcess.php
@@ -0,0 +1,233 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Service;
+
+use InvalidArgumentException;
+use RuntimeException;
+
+/**
+ * Uses php SSH2 library to run SSH Process.
+ *
+ * @author Paul Schweppe
+ */
+class SshProcess implements SshProcessInterface
+{
+ /**
+ * @var array
+ */
+ protected $config;
+
+ /**
+ * @var resource
+ */
+ protected $session;
+
+ /**
+ * @var resource
+ */
+ protected $shell;
+
+ /**
+ * @var array
+ */
+ protected $stdout = [];
+
+ /**
+ * @var array
+ */
+ protected $stderr = [];
+
+ /**
+ * @var array
+ */
+ private $stdin = [];
+
+ /**
+ * @param string $glue
+ *
+ * @return array|string
+ */
+ public function getStdout($glue = "\n")
+ {
+ if (!$glue) {
+ $output = $this->stdout;
+ } else {
+ $output = implode($glue, $this->stdout);
+ }
+
+ return $output;
+ }
+
+ /**
+ * @param string $glue
+ *
+ * @return array|string
+ */
+ public function getStderr($glue = "\n")
+ {
+ if (!$glue) {
+ return $this->stderr;
+ }
+
+ return implode($glue, $this->stderr);
+ }
+
+ /**
+ * @param array $commands
+ * @param string $host
+ * @param string $username
+ * @param int $port
+ * @param string $password
+ * @param string|null $publicKeyFile
+ * @param string|null $privateKeyFile
+ * @param string $passphrase
+ *
+ * @return void
+ */
+ public function run(
+ array $commands,
+ string $host,
+ string $username,
+ int $port = 22,
+ ?string $password = null,
+ ?string $publicKeyFile = null,
+ ?string $privateKeyFile = null,
+ ?string $passphrase = null
+ ): array {
+ $this->reset();
+
+ if ($this->shell === null) {
+ $this->connect($host, $username, $port, $password, $publicKeyFile, $privateKeyFile, $passphrase);
+ }
+
+ foreach ($commands as $command) {
+ $this->execute($command);
+ }
+
+ return $this->stdout;
+ }
+
+ /**
+ * Resets out puts for next command.
+ */
+ protected function reset(): void
+ {
+ $this->stdout = [];
+ $this->stdin = [];
+ $this->stderr = [];
+ }
+
+ /**
+ * @param string $host
+ * @param string $username
+ * @param int $port
+ * @param null|string $password
+ * @param null|string $publicKeyFile
+ * @param null|string $privateKeyFile
+ * @param null|string $passphrase
+ *
+ * @throws InvalidArgumentException
+ * @throws RuntimeException
+ */
+ protected function connect(
+ string $host,
+ string $username,
+ int $port = 22,
+ ?string $password = null,
+ ?string $publicKeyFile = null,
+ ?string $privateKeyFile = null,
+ ?string $passphrase = null
+ ): void {
+ $this->session = ssh2_connect($host, $port);
+
+ if (!$this->session) {
+ throw new InvalidArgumentException(sprintf('SSH connection failed on "%s:%s"', $host, $port));
+ }
+
+ if (isset($username) && $publicKeyFile !== null && $privateKeyFile !== null) {
+ if (!ssh2_auth_pubkey_file($this->session, $username, $publicKeyFile, $privateKeyFile, $passphrase)) {
+ throw new InvalidArgumentException(
+ sprintf('SSH authentication failed for user "%s" with public key "%s"', $username, $publicKeyFile)
+ );
+ }
+ } elseif ($username && $password) {
+ if (!ssh2_auth_password($this->session, $username, $password)) {
+ throw new InvalidArgumentException(sprintf('SSH authentication failed for user "%s"', $username));
+ }
+ }
+
+ $this->shell = ssh2_shell($this->session);
+
+ if (!$this->shell) {
+ throw new RuntimeException(sprintf('Failed opening shell'));
+ }
+
+ $this->stdout = [];
+ $this->stdin = [];
+ }
+
+ public function disconnect(): void
+ {
+ if ($this->shell) {
+ fclose($this->shell);
+ }
+ }
+
+ /**
+ * @param string $command
+ *
+ * @throws RuntimeException
+ */
+ protected function execute(string $command): void
+ {
+ $outStream = ssh2_exec($this->session, $command);
+ $errStream = ssh2_fetch_stream($outStream, SSH2_STREAM_STDERR);
+
+ stream_set_blocking($outStream, true);
+ stream_set_blocking($errStream, true);
+
+ $stdout = explode("\n", stream_get_contents($outStream));
+ $stderr = explode("\n", stream_get_contents($errStream));
+
+ if (count($stderr) > 1) {
+ throw new RuntimeException(
+ sprintf(
+ "Error in command shell:%s \n Error Response:%s",
+ $command,
+ implode("\n", $stderr)
+ )
+ );
+ }
+
+ $this->stdout = array_merge($this->stdout, $stdout);
+
+ if (is_array($stderr)) {
+ $this->stderr = array_merge($this->stderr, $stderr);
+ }
+
+ fclose($outStream);
+ fclose($errStream);
+ }
+
+ public function __destruct()
+ {
+ $this->disconnect();
+ }
+
+ public function getExitStatus()
+ {
+ if (count($this->stderr) > 0) {
+ return 1;
+ }
+
+ return 0;
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/Service/SshProcessInterface.php b/app/src/VersionControl/GitCommandBundle/Service/SshProcessInterface.php
similarity index 57%
rename from src/VersionControl/GitCommandBundle/Service/SshProcessInterface.php
rename to app/src/VersionControl/GitCommandBundle/Service/SshProcessInterface.php
index c7a0bcc..4b84967 100644
--- a/src/VersionControl/GitCommandBundle/Service/SshProcessInterface.php
+++ b/app/src/VersionControl/GitCommandBundle/Service/SshProcessInterface.php
@@ -1,23 +1,23 @@
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle\Service;
/**
- * Interface for SSH Process
+ * Interface for SSH Process.
*
* @author Paul Schweppe
*/
interface SshProcessInterface
{
/**
- *
* @param string $glue
*/
public function getStdout($glue = "\n");
@@ -28,20 +28,34 @@ public function getStdout($glue = "\n");
public function getStderr($glue = "\n");
/**
- * Runs the SSH command
- *
+ * Runs the SSH command.
+ *
* @param array $commands
* @param string $host
* @param string $username
- * @param integer $port
+ * @param int $port
* @param string $password
- * @param string $pubkeyFile
- * @param string $privkeyFile
+ * @param string|null $publicKeyFile
+ * @param string|null $privateKeyFile
* @param string $passphrase
- * @return type
+ *
+ * @return array
*/
- public function run(array $commands,$host,$username,$port=22,$password=null,$pubkeyFile=null,$privkeyFile=null,$passphrase=NULL);
-
+ public function run(
+ array $commands,
+ string $host,
+ string $username,
+ int $port = 22,
+ ?string $password = null,
+ ?string $publicKeyFile = null,
+ ?string $privateKeyFile = null,
+ ?string $passphrase = null
+ ): array;
+
public function disconnect();
-}
+ /**
+ * @return false|int
+ */
+ public function getExitStatus();
+}
diff --git a/src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php
similarity index 51%
rename from src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php
rename to app/src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php
index 00eeaed..9ded6f5 100644
--- a/src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php
@@ -2,20 +2,25 @@
namespace VersionControl\GitCommandBundle\Tests;
+use Gitlab\Model\Commit;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
use VersionControl\GitCommandBundle\GitCommands\GitCommand;
use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
-
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Doctrine\Common\Cache\ArrayCache;
+use VersionControl\GitCommandBundle\Logger\GitCommandLogger;
+use VersionControl\GitCommandBundle\Tests\GitCommands\GitUserFixture;
/**
- * Description of GitCommandTestCase
+ * Description of GitCommandTestCase.
*
* @author fr_user
*/
-class GitCommandTestCase extends \PHPUnit_Framework_TestCase {
-
+class GitCommandTestCase extends TestCase
+{
/**
- * @var GitCommands
+ * @var GitCommand
*/
protected $gitCommands;
@@ -23,7 +28,7 @@ class GitCommandTestCase extends \PHPUnit_Framework_TestCase {
* @var string
*/
protected $path;
-
+
/**
* @var SimpleGitEnvironment
*/
@@ -35,51 +40,41 @@ class GitCommandTestCase extends \PHPUnit_Framework_TestCase {
protected $finder;
/**
- * @param null $name
- *
- * - [setSecurityContext, ["@security.token_storage"]]
- - [setDispatcher, ["@event_dispatcher"]]
- - [setLogger, ["@version_control.logger"]]
- - [setSshProcess, ["@version_control.ssh_process"]]
- - [setSftpProcess, ["@version_control.sftp_process"]]
- - [setCache, ["@array_cache"]]
- *
- * @return
+ * @return GitCommand|GitCommands
*/
- protected function getGitCommands() {
+ protected function getGitCommands()
+ {
if ($this->gitCommands == null) {
-
$this->gitCommands = new GitCommand();
- $this->assertInstanceOf('VersionControl\GitCommandBundle\GitCommands\GitCommand', $this->gitCommands);
- $logger = $this->getMockBuilder('VersionControl\GitCommandBundle\Logger\GitCommandLogger')
- ->disableOriginalConstructor()
- ->getMock();
+ $this->assertInstanceOf(GitCommand::class, $this->gitCommands);
+
+ $logger = $this->getMockBuilder(GitCommandLogger::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->gitCommands->setLogger($logger);
- $arrayCache = $this->getMockBuilder('Doctrine\Common\Cache\ArrayCache')
- ->disableOriginalConstructor()
- ->getMock();
+ $arrayCache = $this->getMockBuilder(ArrayCache::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->gitCommands->setCache($arrayCache);
-
- $dispatch = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
- ->disableOriginalConstructor()
- ->getMock();
-
+
+ $dispatch = $this->getMockBuilder(EventDispatcher::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
$this->gitCommands->setDispatcher($dispatch);
-
+
+ $this->gitCommands->setGitUser(new GitUserFixture());
}
return $this->gitCommands;
}
/**
- * @param null|string $name the folder name
- * @param int $index the repository index (for getting them back)
- *
- * @return void
*/
- protected function initGitCommandsLocal() {
+ protected function initGitCommandsLocal()
+ {
$tempDir = realpath(sys_get_temp_dir());
$tempFullPathName = tempnam($tempDir, 'versioncontrol');
$this->path = $tempFullPathName;
@@ -91,65 +86,67 @@ protected function initGitCommandsLocal() {
$this->gitEnvironment->setId(1);
$this->gitEnvironment->setPath($this->path);
$this->gitEnvironment->setSsh(false);
-
+
$this->getGitCommands();
$this->gitCommands->setGitEnvironment($this->gitEnvironment);
}
- protected function tearDown() {
+ protected function tearDown(): void
+ {
$fs = new Filesystem();
$fs->remove($this->path);
- //m::close();
+
}
/**
- * @param string $name file name
- * @param string|null $folder folder name
- * @param null $content content
- *
- * @return void
+ * @param string $name file name
+ * @param string|null $folder folder name
+ * @param null $content content
*/
- protected function addFile($name, $folder = null, $content = null) {
+ protected function addFile($name, $folder = null, $content = null)
+ {
$path = $this->path;
-
+
$filename = $folder == null ?
- $path . DIRECTORY_SEPARATOR . $name :
- $path . DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR . $name;
- $handle = fopen($filename, 'w');
+ $path . DIRECTORY_SEPARATOR . $name :
+ $path . DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR . $name;
+ $handle = fopen($filename, 'wb');
$fileContent = $content == null ? 'test content' : $content;
- $this->assertTrue(false !== fwrite($handle, $fileContent), sprintf('unable to write the file %s', $name));
+ $this->assertNotSame(false, fwrite($handle, $fileContent), sprintf('unable to write the file %s', $name));
fclose($handle);
}
/**
- * remove file from repo
+ * remove file from repo.
*
* @param string $name
*/
- protected function removeFile($name) {
+ protected function removeFile($name)
+ {
$filename = $this->path . DIRECTORY_SEPARATOR . $name;
$this->assertTrue(unlink($filename));
}
/**
- * update a file in the repository
+ * update a file in the repository.
*
- * @param string $name file name
+ * @param string $name file name
* @param string $content content
*/
- protected function updateFile($name, $content) {
+ protected function updateFile($name, $content)
+ {
$filename = $this->path . DIRECTORY_SEPARATOR . $name;
- $this->assertTrue(false !== file_put_contents($filename, $content));
+ $this->assertNotSame(false, file_put_contents($filename, $content));
}
/**
- * rename a file in the repository
+ * rename a file in the repository.
*
* @param string $originName file name
* @param string $targetName new file name
*/
- protected function renameFile($originName, $targetName) {
-
+ protected function renameFile($originName, $targetName)
+ {
$origin = $this->path . DIRECTORY_SEPARATOR . $originName;
$target = $this->path . DIRECTORY_SEPARATOR . $targetName;
$fs = new Filesystem();
@@ -158,68 +155,80 @@ protected function renameFile($originName, $targetName) {
/**
* @param string $name name
- *
- * @return void
*/
- protected function addFolder($name) {
+ protected function addFolder($name)
+ {
$fs = new Filesystem();
$fs->mkdir($this->path . DIRECTORY_SEPARATOR . $name);
}
-
/**
- * mock the caller
+ * mock the caller.
*
* @param string $command command
- * @param string $output output
+ * @param string $output output
*
- * @return \PHPUnit_Framework_MockObject_MockObject
+ * @return MockObject
*/
- protected function getMockCaller($command, $output) {
+ protected function getMockCaller($command, $output)
+ {
$mock = $this->getMock('GitElephant\Command\Caller\CallerInterface');
$mock
- ->expects($this->any())
- ->method('execute')
- ->will($this->returnValue($mock));
+ ->expects($this->any())
+ ->method('execute')
+ ->will($this->returnValue($mock));
$mock
- ->expects($this->any())
- ->method('getOutputLines')
- ->will($this->returnValue($output));
+ ->expects($this->any())
+ ->method('getOutputLines')
+ ->willReturn($output);
+
return $mock;
}
- protected function getMockContainer() {
+ protected function getMockContainer()
+ {
return $this->getMock('GitElephant\Command\CommandContainer');
}
- protected function addCommandToMockContainer(\PHPUnit_Framework_MockObject_MockObject $container, $commandName) {
+ protected function addCommandToMockContainer(MockObject $container, $commandName)
+ {
$container
- ->expects($this->any())
- ->method('get')
- ->with($this->equalTo($commandName))
- ->will($this->returnValue($this->getMockCommand()));
+ ->expects($this->any())
+ ->method('get')
+ ->with($this->equalTo($commandName))
+ ->willReturn($this->getMockCommand());
}
- protected function addOutputToMockRepo(\PHPUnit_Framework_MockObject_MockObject $repo, $output) {
+ protected function addOutputToMockRepo(MockObject $repo, $output)
+ {
$repo
- ->expects($this->any())
- ->method('getCaller')
- ->will($this->returnValue($this->getMockCaller('', $output)));
+ ->expects($this->any())
+ ->method('getCaller')
+ ->willReturn($this->getMockCaller('', $output));
}
- protected function getMockCommand() {
+ protected function getMockCommand()
+ {
$command = $this->getMock('Command', array('showCommit'));
$command
- ->expects($this->any())
- ->method('showCommit')
- ->will($this->returnValue(''));
+ ->expects($this->any())
+ ->method('showCommit')
+ ->willReturn('');
+
return $command;
}
-
-
protected function doCommitTest(
- Commit $commit, $sha, $tree, $author, $committer, $emailAuthor, $emailCommitter, $datetimeAuthor, $datetimeCommitter, $message
+ Commit $commit,
+ $sha,
+ $tree,
+ $author,
+ $committer,
+ $emailAuthor,
+ $emailCommitter,
+ $datetimeAuthor,
+ $datetimeCommitter,
+ $message
) {
$this->assertInstanceOf('GitElephant\Objects\Commit', $commit);
$this->assertEquals($sha, $commit->getSha());
@@ -236,5 +245,4 @@ protected function doCommitTest(
$this->assertEquals($datetimeCommitter, $commit->getDatetimeCommitter()->format('U'));
$this->assertEquals($message, $commit->getMessage()->getShortMessage());
}
-
}
diff --git a/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitBranchCommandTest.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitBranchCommandTest.php
similarity index 53%
rename from src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitBranchCommandTest.php
rename to app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitBranchCommandTest.php
index 1fd1ba4..d5e9f10 100644
--- a/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitBranchCommandTest.php
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitBranchCommandTest.php
@@ -10,153 +10,176 @@
namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
+use VersionControl\GitCommandBundle\GitCommands\Exception\DeleteBranchException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
+
/**
- * Description of GitBranchCommandTest
+ * Description of GitBranchCommandTest.
*
* @author fr_user
*/
-class GitBranchCommandTest extends GitCommandTestCase{
-
+class GitBranchCommandTest extends GitCommandTestCase
+{
/**
- * setUp, called on every method
+ * setUp, called on every method.
*/
- public function setUp()
+ public function setUp(): void
{
$this->initGitCommandsLocal();
$this->gitCommands->command('init')->initRepository();
$this->addFile('test');
$this->gitCommands->command('commit')->stageAll();
- $this->gitCommands->command('commit')->commit('first commit','Paul Schweppe ');
+ $this->gitCommands->command('commit')->commit('first commit', 'Paul Schweppe ');
$this->addFile('test2');
$this->gitCommands->command('commit')->stageAll();
- $this->gitCommands->command('commit')->commit('Second commit','Paul Schweppe ');
+ $this->gitCommands->command('commit')->commit('Second commit', 'Paul Schweppe ');
}
-
+
/**
- * Test current branch
+ * Test current branch.
*/
- public function testGetCurrentBranch(){
+ public function testGetCurrentBranch()
+ {
$currentBranch = $this->gitCommands->command('branch')->getCurrentBranch();
- $this->assertEquals("master", $currentBranch, 'master does not equal '.$currentBranch);
+ $this->assertEquals('master', $currentBranch, 'master does not equal ' . $currentBranch);
}
-
+
/**
- * Test create local branch
+ * Test create local branch.
*/
- public function testCreateLocalBranch(){
+ public function testCreateLocalBranch()
+ {
$branchCommand = $this->gitCommands->command('branch');
-
- $this->assertEquals("", $branchCommand->createLocalBranch('branch1'), 'create branch command');
- $this->assertEquals("Switched to branch 'branch2'", $branchCommand->createLocalBranch('branch2',true), 'create branch command and switch');
-
+
+ $this->assertEquals('', $branchCommand->createLocalBranch('branch1'), 'create branch command');
+ $this->assertEquals("Switched to branch 'branch2'", $branchCommand->createLocalBranch('branch2', true),
+ 'create branch command and switch');
+
$errorMessage = '';
- try{
+ try {
$branchCommand->createLocalBranch('branch1');
- }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e){
+ } catch (RunGitCommandException $e) {
$errorMessage = $e->getMessage();
}
- $this->assertEquals("fatal: A branch named 'branch1' already exists.", trim($errorMessage), 'create branch command error');
+ $this->assertEquals("fatal: A branch named 'branch1' already exists.", trim($errorMessage),
+ 'create branch command error');
}
-
+
/**
- * Test Get branches
+ * Test Get branches.
*/
- public function testGetBranches(){
+ public function testGetBranches()
+ {
$branchCommand = $this->gitCommands->command('branch');
$branches = $branchCommand->getBranches();
- $this->assertEquals(array("master"), $branches, ' branch listing does not equal expected');
+ $this->assertEquals(array('master'), $branches, ' branch listing does not equal expected');
$branchCommand->createLocalBranch('branch1');
- $this->assertEquals(array("branch1","master"), $branchCommand->getBranches(), ' branch listing does not equal expected');
+ $this->assertEquals(array('branch1', 'master'), $branchCommand->getBranches(),
+ ' branch listing does not equal expected');
- $this->assertEquals(array("branch1","master"), $branchCommand->getBranches(true), ' branch listing does not equal expected');
+ $this->assertEquals(array('branch1', 'master'), $branchCommand->getBranches(true),
+ ' branch listing does not equal expected');
}
-
+
/**
- * Test Get branches
+ * Test Get branches.
*/
- public function testGetRemoteBranches(){
+ public function testGetRemoteBranches()
+ {
$branchCommand = $this->gitCommands->command('branch');
$branches = $branchCommand->getRemoteBranches();
- $this->assertEquals(array(), $branches, ' branch listing does not equal expected');
+ $this->assertEquals(array(), $branches, ' branch listing does not equal expected');
}
-
- public function testGetBranchRemoteListing(){
+
+ public function testGetBranchRemoteListing()
+ {
$branchCommand = $this->gitCommands->command('branch');
$remoteBranches = $branchCommand->getBranchRemoteListing();
- $this->assertEquals(array(), $remoteBranches, ' branch listing does not equal expected');
+ $this->assertEquals(array(), $remoteBranches, ' branch listing does not equal expected');
}
-
- public function testRenameCurrentBranch(){
+
+ public function testRenameCurrentBranch()
+ {
$branchCommand = $this->gitCommands->command('branch');
$response = $branchCommand->renameCurrentBranch('branch1');
- $this->assertEquals("", $response, 'Rename master to branch1 does not work');
+ $this->assertEquals('', $response, 'Rename master to branch1 does not work');
$currentBranch = $branchCommand->getCurrentBranch();
- $this->assertEquals("branch1", $currentBranch, 'Rename master to branch1 does not work');
+ $this->assertEquals('branch1', $currentBranch, 'Rename master to branch1 does not work');
}
-
- public function testCheckoutBranch(){
+
+ public function testCheckoutBranch()
+ {
$branchCommand = $this->gitCommands->command('branch');
$branchCommand->createLocalBranch('branch1');
-
+
$response = $branchCommand->checkoutBranch('branch1');
$this->assertEquals("Switched to branch 'branch1'", $response, 'Checkout branch1 does not work');
-
+
$currentBranch = $branchCommand->getCurrentBranch();
- $this->assertEquals("branch1", $currentBranch, 'Checkout branch1 not correct');
- }
-
- /**
- * Test branch names
- */
- public function testValidateBranchName(){
-
- $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test'),'Branch name "test" should be valid');
- $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test1232'),'Branch name "test" should be valid');
- $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test!£$test'),'Branch name "test!£$test" should be valid');
-
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('..test'),'Branch name "..test" should be invalid');
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te:st'),'Branch name "te:st" should be invalid');
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te~st'),'Branch name "te~st" should be invalid');
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te^st'),'Branch name "te^st" should be invalid');
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('test/'),'Branch name "test/" should be invalid');
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('\test'),'Branch name "\test" should be invalid');
- $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('test test'),'Branch name "test test" should be invalid');
+ $this->assertEquals('branch1', $currentBranch, 'Checkout branch1 not correct');
}
-
+
/**
- *
+ * Test branch names.
*/
- public function testDeleteBranch(){
+ public function testValidateBranchName()
+ {
+ $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test'),
+ 'Branch name "test" should be valid');
+ $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test1232'),
+ 'Branch name "test" should be valid');
+ $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test!£$test'),
+ 'Branch name "test!£$test" should be valid');
+
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('..test'),
+ 'Branch name "..test" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te:st'),
+ 'Branch name "te:st" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te~st'),
+ 'Branch name "te~st" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te^st'),
+ 'Branch name "te^st" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('test/'),
+ 'Branch name "test/" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('\test'),
+ 'Branch name "\test" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('test test'),
+ 'Branch name "test test" should be invalid');
+ }
+
+ public function testDeleteBranch()
+ {
$branchCommand = $this->gitCommands->command('branch');
$branchCommand->createLocalBranch('branch1');
$response = $branchCommand->deleteBranch('branch1');
- $this->assertContains("Deleted branch branch1", $response, 'Delete branch1 does not work');
-
+ $this->assertContains('Deleted branch branch1', $response, 'Delete branch1 does not work');
+
$errorMessage = '';
- try{
+ try {
$branchCommand->deleteBranch('master');
- }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\DeleteBranchException $e){
+ } catch (DeleteBranchException $e) {
$errorMessage = $e->getMessage();
}
- $this->assertEquals("You cannot delete the current branch. Please checkout a different branch before deleting.", trim($errorMessage), 'create branch command error');
-
+ $this->assertEquals('You cannot delete the current branch. Please checkout a different branch before deleting.',
+ trim($errorMessage), 'create branch command error');
}
-
- public function testMergeBranch(){
+
+ public function testMergeBranch()
+ {
$branchCommand = $this->gitCommands->command('branch');
- $branchCommand->createLocalBranch('branch1',true);
-
+
+ $branchCommand->createLocalBranch('branch1', true);
+
+
$this->addFile('test3');
$this->gitCommands->command('commit')->stageAll();
- $this->gitCommands->command('commit')->commit('Third commit','Paul Schweppe ');
-
+ $this->gitCommands->command('commit')->commit('Third commit', 'Paul Schweppe ');
+
$branchCommand->checkoutBranch('master');
-
+
$response = $branchCommand->mergeBranch('branch1');
-
- $this->assertContains("1 file changed, 1 insertion(+)", $response, 'Merge branch failed');
+ $this->assertContains('1 file changed, 1 insertion(+)', $response, 'Merge branch failed');
}
-
}
diff --git a/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitCommitCommandTest.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitCommitCommandTest.php
new file mode 100644
index 0000000..969e7a2
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitCommitCommandTest.php
@@ -0,0 +1,65 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
+
+use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
+use VersionControl\GitCommandBundle\Entity\GitFile;
+
+/**
+ * Description of GitBranchCommandTest.
+ *
+ * @author fr_user
+ */
+class GitCommitCommandTest extends GitCommandTestCase
+{
+ /**
+ * setUp, called on every method.
+ */
+ public function setUp(): void
+ {
+ $this->initGitCommandsLocal();
+ $this->gitCommands->command('init')->initRepository();
+ $this->addFile('test');
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('first commit', 'Paul Schweppe ');
+ $this->addFile('test2');
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('Second commit', 'Paul Schweppe ');
+ }
+
+ /**
+ * Test Getting commit files.
+ */
+ public function testGetFilesToCommit()
+ {
+ $this->addFile('test3.txt');
+ $this->updateFile('test2', 'Test content');
+
+ $files = $this->gitCommands->command('commit')->getFilesToCommit();
+ $this->assertCount(2, $files, 'Files to commit returns more to 2 enitities ');
+ foreach ($files as $gitFile) {
+ $this->assertInstanceOf(GitFile::class, $gitFile);
+ }
+ $gitFile1 = $files[0];
+ $this->assertEquals('', $gitFile1->getFileType(), 'File type failed for git file 1');
+ $this->assertEquals(' ', $gitFile1->getIndexStatus(), 'Index Status failed for git file 1');
+ $this->assertEquals('test2', $gitFile1->getPath1(), 'Path 1 failed for git file 1');
+ $this->assertEquals('M', $gitFile1->getWorkTreeStatus(), 'Work tree status failed for git file 1');
+ $this->assertEquals('', $gitFile1->getPath2(), 'Path 2 failed for git file 1');
+
+ $gitFile2 = $files[1];
+ $this->assertEquals('', $gitFile2->getFileType(), 'File type failed for git file 2');
+ $this->assertEquals('test3.txt', $gitFile2->getPath1(), 'Path 1 failed for git file 2');
+ $this->assertEquals('?', $gitFile2->getIndexStatus(), 'Index Status failed for git file 2');
+ $this->assertEquals('?', $gitFile2->getWorkTreeStatus(), 'Work tree status failed for git file 2');
+ $this->assertEquals('', $gitFile2->getPath2(), 'Path 2 failed for git file 2');
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitDiffCommandTest.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitDiffCommandTest.php
new file mode 100644
index 0000000..40f2cd8
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitDiffCommandTest.php
@@ -0,0 +1,83 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
+
+use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
+use VersionControl\GitCommandBundle\Entity\GitDiff;
+use VersionControl\GitCommandBundle\Entity\GitCommitFile;
+
+/**
+ * Description of GitBranchCommandTest.
+ *
+ * @author fr_user
+ */
+class GitDiffCommandTest extends GitCommandTestCase
+{
+ /**
+ * setUp, called on every method.
+ */
+ public function setUp(): void
+ {
+ $this->initGitCommandsLocal();
+ $this->gitCommands->command('init')->initRepository();
+ $this->addFile('test');
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('first commit', 'Paul Schweppe ');
+ $this->updateFile('test', 'Test content some more data');
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('Second commit', 'Paul Schweppe ');
+ $this->updateFile('test', 'Test Data has changed');
+ }
+
+ public function testGetPreviousCommitHash(){
+
+ $previousCommitHash = $this->gitCommands->command('diff')->getPreviousCommitHash();
+ $this->assertTrue(strlen($previousCommitHash) === 7,'Previous Commit hash does not equal 7 characters: '.$previousCommitHash);
+
+ }
+
+ /**
+ * Test Getting commit files.
+ */
+ public function testGetDiffFile()
+ {
+
+ $diffs = $this->gitCommands->command('diff')->getDiffFile('test');
+
+ $this->assertCount(1, $diffs,'Diff count does not equal expected 17. Actual:'.count($diffs).print_r($diffs,true));
+ foreach ($diffs as $diff) {
+ $this->assertInstanceOf(GitDiff::class, $diff);
+ }
+ }
+
+ public function testGetDiffFileBetweenCommits(){
+
+ $previousCommitHash = $this->gitCommands->command('diff')->getPreviousCommitHash();
+
+ $diffs = $this->gitCommands->command('diff')->getDiffFileBetweenCommits('test',$previousCommitHash,'HEAD');
+ foreach ($diffs as $diff) {
+ $this->assertInstanceOf(GitDiff::class, $diff);
+ }
+ }
+
+ public function testGetFilesInCommit(){
+ $filesCommitted = $this->gitCommands->command('diff')->getFilesInCommit('HEAD');
+
+ $this->assertCount(1, $filesCommitted,'Only one file should have been commited. Actual:'.count($filesCommitted));
+
+ foreach ($filesCommitted as $commitFile) {
+ $this->assertInstanceOf(GitCommitFile::class, $commitFile);
+ }
+ }
+
+
+
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitFilesCommandTest.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitFilesCommandTest.php
new file mode 100644
index 0000000..792cc64
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitFilesCommandTest.php
@@ -0,0 +1,233 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
+
+use SplFileInfo;
+use VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException;
+use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException;
+use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
+use VersionControl\GitCommandBundle\Entity\GitLog;
+
+/**
+ * GitFilesCommandTest.
+ *
+ * @author Paul Schweppe
+ */
+class GitFilesCommandTest extends GitCommandTestCase
+{
+ /**
+ * setUp, called on every method.
+ */
+ public function setUp(): void
+ {
+ $this->initGitCommandsLocal();
+ $this->gitCommands->command('init')->initRepository();
+ $this->addFile('test', null, 'Test Of List Files');
+ $this->addFolder('MoreFiles');
+ $this->addFile('test2', 'MoreFiles', 'Test Of file in MoreFiles folder');
+
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('first commit', 'Paul Schweppe ');
+
+ $this->addFile('test3', null, 'This file is not commited');
+
+ }
+
+ /**
+ * Test list files.
+ */
+ public function testListFiles()
+ {
+ $files = $this->gitCommands->command('files')->listFiles('');
+
+ $this->assertCount(3, $files, 'File list count does not equal expected 3. Actual:' . count($files));
+
+ foreach ($files as $file) {
+ $this->assertInstanceOf(SplFileInfo::class, $file);
+ }
+
+ $this->assertTrue($files[0]->isDir(), 'First file should be a directory');
+ $this->assertTrue($files[1]->isFile(), 'Second file should be a file');
+
+ $this->assertInstanceOf(GitLog::class, $files[1]->getGitLog());
+ $this->assertNull($files[2]->getGitLog(), 'Third file should not have a git log');
+
+ $errorMessage = '';
+ try {
+ $this->gitCommands->command('files')->listFiles('../');
+ } catch (InvalidDirectoryException $e) {
+ $errorMessage = $e->getMessage();
+ }
+ $this->assertContains('Directory path is not valid', trim($errorMessage), 'Invalid Directory error');
+ }
+
+ /**
+ * Test Get File
+ */
+ public function testGetFile()
+ {
+ $file = $this->gitCommands->command('files')->getFile('MoreFiles/test2');
+ $this->assertTrue($file->isFile(), '');
+ $this->assertInstanceOf(SplFileInfo::class, $file);
+ $this->assertInstanceOf(GitLog::class, $file->getGitLog());
+
+ $errorMessage = '';
+ try {
+ $fileNotExisting = $this->gitCommands->command('files')->getFile('MoreFiles/testDoesNotExist');
+ } catch (InvalidDirectoryException $e) {
+ $errorMessage = $e->getMessage();
+ }
+
+ $this->assertFalse($fileNotExisting->getRealPath(), '');
+ //$this->assertContains("Directory path is not valid", trim($errorMessage), 'Invalid Directory error:'.$errorMessage);
+ }
+
+ /**
+ * Test Read File
+ */
+ public function testReadFile()
+ {
+ $file = $this->gitCommands->command('files')->getFile('MoreFiles/test2');
+ $fileContent = $this->gitCommands->command('files')->readFile($file);
+ $this->assertContains('Test Of file in MoreFiles folder', trim($fileContent),
+ 'File content did not match:' . $fileContent);
+
+ }
+
+ /**
+ * Test malicious file paths
+ */
+ public function testValidPathStr()
+ {
+
+ $filesCommand = $this->gitCommands->command('files');
+ $this->assertTrue($filesCommand->ValidPathStr('MoreFiles/test2'), 'Path "MoreFiles/test2" should be valid');
+ $this->assertFalse($filesCommand->ValidPathStr('/MoreFiles/test2'), 'Path "/MoreFiles/test2" should be valid');
+ $this->assertFalse($filesCommand->ValidPathStr('.git/config'), 'Path ".git/config" should be valid');
+ $this->assertFalse($filesCommand->ValidPathStr('/'), 'Path "/" should be valid');
+ $this->assertFalse($filesCommand->ValidPathStr('/../'), 'Path "/../" should be valid');
+ $this->assertFalse($filesCommand->ValidPathStr('//test'), 'Path "//test" should be valid');
+ $this->assertFalse($filesCommand->ValidPathStr('\test'), 'Path "\test" should be valid');
+
+ $this->assertTrue(
+ $filesCommand->ValidPathStr('test/test/Ссылка (fce).xml'),
+ 'Path "test/test/Ссылка (fce).xml" should be valid'
+ );
+
+ }
+
+ public function testIsFileIgnored()
+ {
+ $filesCommand = $this->gitCommands->command('files');
+ $this->addFile('ignoretest', null, 'Git should Ignore');
+ $this->addFile('.gitignore', null, 'ignoretest');
+
+ $this->assertTrue($filesCommand->isFileIgnored('ignoretest'), 'File ignoretest should be ignored');
+
+ $this->updateFile('.gitignore', null);
+ $this->assertFalse($filesCommand->isFileIgnored('test'),
+ 'File test is not ignored because it is commited already');
+
+ $this->assertFalse($filesCommand->isFileIgnored('notest'), 'File does not exist');
+
+ $this->assertFalse($filesCommand->isFileIgnored('MoreFiles/test2'), 'File exists and should not be ignored');
+ }
+
+ public function testIsFileTracked()
+ {
+ $filesCommand = $this->gitCommands->command('files');
+ $this->addFile('ignoretest', null, 'Git should Ignore');
+ $this->addFile('.gitignore', null, 'ignoretest');
+
+ $this->assertFalse($filesCommand->isFileTracked('ignoretest'), 'File ignoretest should be ignored');
+
+ $this->updateFile('.gitignore', null);
+ $this->assertTrue($filesCommand->isFileTracked('test'),
+ 'File test is not ignored because it is commited already');
+
+ $this->assertFalse($filesCommand->isFileTracked('notest'), 'File does not exist');
+
+ $this->assertTrue($filesCommand->isFileTracked('MoreFiles/test2'), 'File exists and should not be ignored');
+ }
+
+ public function testIgnoreFile()
+ {
+ $filesCommand = $this->gitCommands->command('files');
+ $this->addFile('ignoretest', null, 'Git should Ignore');
+
+ $response = $filesCommand->ignoreFile('ignoretest');
+
+ $this->assertEquals('File added to .gitignore', $response);
+
+ $message = '';
+ try {
+ $filesCommand->ignoreFile('test');
+ } catch (FileStatusException $e) {
+ $message = $e->getMessage();
+ }
+
+ $this->assertEquals('File path is been tracked. Please un-track file first', $message);
+
+ try {
+ $filesCommand->ignoreFile('testFileDoesNotExist');
+ } catch (InvalidFilePathException $e) {
+ $message = $e->getMessage();
+ }
+
+ $this->assertEquals('File path was not valid. Please check that the file exists.', $message);
+ }
+
+ public function testUnTrackFileExceptionFromRepoNotCommitted(): void
+ {
+ $this->expectException(FileStatusException::class);
+ $filesCommand = $this->gitCommands->command('files');
+ $filesCommand->unTrackFile('test');
+ }
+
+ public function testUnTrackFile()
+ {
+ $filesCommand = $this->gitCommands->command('files');
+
+ //Commit all files
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('second commit', 'Paul Schweppe ');
+
+ //Untrack file should now work
+ $response = $filesCommand->unTrackFile('test');
+ $this->assertContains('Please commit to complete the removal', $response);
+ }
+
+ public function testFileNolongerTrackAfterUntrackFile()
+ {
+ $filesCommand = $this->gitCommands->command('files');
+
+ //Commit all files
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('second commit', 'Paul Schweppe ');
+
+ //Untrack file should now work
+ $filesCommand->unTrackFile('test');
+
+ //Add test to .gitignore. Must happen before commit
+ $this->updateFile('.gitignore', 'test');
+
+ //Commit change to untracked file
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit(
+ 'Remove file from git index',
+ 'Paul Schweppe '
+ );
+
+ //Test that file is no longer tracked
+ $this->assertFalse($filesCommand->isFileTracked('test'), 'Test that test file is no longer tracked');
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitTagCommandTest.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitTagCommandTest.php
new file mode 100644
index 0000000..7c27a5a
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitTagCommandTest.php
@@ -0,0 +1,112 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
+
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
+
+/**
+ * Description of GitBranchCommandTest.
+ *
+ * @author fr_user
+ */
+class GitTagCommandTest extends GitCommandTestCase
+{
+ /**
+ * setUp, called on every method.
+ */
+ public function setUp(): void
+ {
+ $this->initGitCommandsLocal();
+ $this->gitCommands->command('init')->initRepository();
+ $this->addFile('test');
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('first commit', 'Paul Schweppe ');
+ $this->addFile('test2');
+ $this->gitCommands->command('commit')->stageAll();
+ $this->gitCommands->command('commit')->commit('Second commit', 'Paul Schweppe ');
+ }
+
+ /**
+ * Test current branch.
+ */
+ public function testGetTagsNoTags()
+ {
+ $tags = $this->gitCommands->command('tag')->getTags();
+ $this->assertCount(0, $tags, 'Tag count does not equal expected 0. Actual:' . count($tags));
+ }
+
+ /**
+ * Test create local branch.
+ */
+ public function testCreateAnnotatedTag()
+ {
+ $tagCommand = $this->gitCommands->command('tag');
+
+ $this->assertEquals('', $tagCommand->createAnnotatedTag('tag1', 'Test of tag1'), 'create tag command');
+
+ $tags = $this->gitCommands->command('tag')->getTags();
+ $this->assertCount(1, $tags, 'Tag count does not equal expected 1. Actual:' . count($tags));
+
+ $errorMessage = '';
+ try {
+ $tagCommand->createAnnotatedTag('tag1', 'Test of tag1');
+ } catch (RunGitCommandException $e) {
+ $errorMessage = $e->getMessage();
+ }
+ $this->assertEquals("fatal: tag 'tag1' already exists", trim($errorMessage), 'create branch command error');
+ }
+
+ public function testPushTag()
+ {
+ $tagCommand = $this->gitCommands->command('tag');
+
+ $this->assertEquals('', $tagCommand->createAnnotatedTag('tag1', 'Test of tag1'), 'create tag command');
+
+ //
+ try {
+ $this->assertEquals('', $tagCommand->pushTag('origin', 'tag1'), 'Push tag1 to origin');
+ } catch (RunGitCommandException $e) {
+ $errorMessage = $e->getMessage();
+ }
+ $this->assertContains("fatal: 'origin' does not appear to be a git repository", trim($errorMessage),
+ 'push tag command error');
+
+ }
+
+ /**
+ * Test branch names.
+ */
+ public function testValidateTagName()
+ {
+ $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test'),
+ 'Branch name "test" should be valid');
+ $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test1232'),
+ 'Branch name "test" should be valid');
+ $this->assertTrue($this->gitCommands->command('branch')->validateBranchName('test!£$test'),
+ 'Branch name "test!£$test" should be valid');
+
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('..test'),
+ 'Branch name "..test" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te:st'),
+ 'Branch name "te:st" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te~st'),
+ 'Branch name "te~st" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('te^st'),
+ 'Branch name "te^st" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('test/'),
+ 'Branch name "test/" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('\test'),
+ 'Branch name "\test" should be invalid');
+ $this->assertFalse($this->gitCommands->command('branch')->validateBranchName('test test'),
+ 'Branch name "test test" should be invalid');
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitDiffParserTest.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitDiffParserTest.php
new file mode 100644
index 0000000..4390021
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitDiffParserTest.php
@@ -0,0 +1,61 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
+
+use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
+use VersionControl\GitCommandBundle\GitCommands\GitDiffParser;
+use VersionControl\GitCommandBundle\Entity\GitDiff;
+
+/**
+ * Description of GitBranchCommandTest.
+ *
+ * @author fr_user
+ */
+class GitDiffParserTest extends GitCommandTestCase
+{
+ /**
+ * Test Getting commit files.
+ */
+ public function testGetCommitDiff()
+ {
+ $diffString =
+ 'diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php b/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
+index b9b5a2a..53b3b2d 100644
+--- a/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
++++ b/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
+@@ -50,6 +50,7 @@ class ProjectHistoryController extends BaseProjectController
+
+ $currentPage = $request->query->get(\'page\', 1);
+ $filter = false;
++ $keyword = \'\';
+ //Search
+ /*$keyword = $request->query->get(\'keyword\', false);
+ $filter= $request->query->get(\'filter\', false);
+@@ -103,7 +104,7 @@ class ProjectHistoryController extends BaseProjectController
+ \'totalCount\' => $this->gitLogCommand->getTotalCount(),
+ \'limit\' => $this->gitLogCommand->getLimit(),
+ \'currentPage\' => $this->gitLogCommand->getPage()+1,
+- //\'keyword\' => $keyword,
++ \'keyword\' => $keyword,
+ \'filter\' => $filter,
+ \'searchForm\' => $searchForm->createView()
+ ));';
+
+ $diffParser = new GitDiffParser($diffString);
+ $diffs = $diffParser->parse();
+
+ $this->assertCount(1, $diffs,'Diff count does not equal expected 17. Actual:'.count($diffs).print_r($diffs,true));
+ foreach ($diffs as $diff) {
+ $this->assertInstanceOf(GitDiff::class, $diff);
+ }
+
+ }
+}
diff --git a/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitUserFixture.php b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitUserFixture.php
new file mode 100644
index 0000000..631f7e3
--- /dev/null
+++ b/app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitUserFixture.php
@@ -0,0 +1,26 @@
+
*/
-class SimpleGitEnvironment implements GitEnvironmentInterface {
-
+class SimpleGitEnvironment implements GitEnvironmentInterface
+{
private $id;
/**
@@ -32,54 +32,52 @@ class SimpleGitEnvironment implements GitEnvironmentInterface {
* @var string
*/
private $ssh;
-
+
/**
* @var string
*/
private $host;
-
+
/**
* @var string
*/
private $username;
-
+
/**
* @var string
*/
private $password;
-
-
+
/**
* @var string
*/
- private $privateKey = null;
-
+ private $privateKey;
+
/**
* @var string
*/
- private $privateKeyPassword = null;
-
+ private $privateKeyPassword;
public function __construct()
{
-
}
-
- public function getId() {
+
+ public function getId()
+ {
return $this->id;
}
- public function setId($id) {
+ public function setId($id)
+ {
$this->id = $id;
}
-
/**
- * Set path
+ * Set path.
*
* @param string $path
*
- * @return Project
+ * @return SimpleGitEnvironment
*/
public function setPath($path)
{
@@ -89,7 +87,7 @@ public function setPath($path)
}
/**
- * Get path
+ * Get path.
*
* @return string
*/
@@ -97,117 +95,143 @@ public function getPath()
{
return $this->path;
}
-
+
/**
- * Get SSH value
- * @return boolean
+ * Get SSH value.
+ *
+ * @return bool
*/
- public function getSsh() {
+ public function getSsh()
+ {
return $this->ssh;
}
-
+
/**
- * Set to use SSH
- * @param boolean $ssh
+ * Set to use SSH.
+ *
+ * @param bool $ssh
*/
- public function setSsh($ssh) {
+ public function setSsh($ssh)
+ {
$this->ssh = $ssh;
}
/**
- * Get SSH host
+ * Get SSH host.
+ *
* @return string
*/
- public function getHost() {
+ public function getHost()
+ {
return $this->host;
}
-
+
/**
- * Set SSH host
+ * Set SSH host.
+ *
* @param string $host
*/
- public function setHost($host) {
+ public function setHost($host)
+ {
$this->host = $host;
}
/**
- * Get SSH username
+ * Get SSH username.
+ *
* @return string
*/
- public function getUsername() {
+ public function getUsername()
+ {
return $this->username;
}
-
+
/**
- * set SSH username
+ * set SSH username.
+ *
* @param type $username
*/
- public function setUsername($username) {
+ public function setUsername($username)
+ {
$this->username = $username;
}
/**
- * Get SSH password
+ * Get SSH password.
+ *
* @return string
*/
- public function getPassword() {
+ public function getPassword()
+ {
return $this->password;
}
/**
- * Set SSH password
+ * Set SSH password.
+ *
* @param string $password
*/
- public function setPassword($password) {
- if (!is_null($password)) {
+ public function setPassword($password)
+ {
+ if (null !== $password) {
$this->password = $password;
}
}
-
/**
- * Get Private Key
+ * Get Private Key.
+ *
* @return string
*/
- public function getPrivateKey() {
+ public function getPrivateKey()
+ {
return $this->privateKey;
}
/**
- * Get Private Key Password
+ * Get Private Key Password.
+ *
* @return string
*/
- public function getPrivateKeyPassword() {
+ public function getPrivateKeyPassword()
+ {
return $this->privateKeyPassword;
}
/**
- * Set Private Key
+ * Set Private Key.
+ *
* @param string $privateKey
- * @return \VersionControl\GitControlBundle\Entity\ProjectEnvironment
+ *
+ * @return SimpleGitEnvironment
*/
- public function setPrivateKey($privateKey) {
-
- if (!is_null($privateKey)) {
+ public function setPrivateKey($privateKey)
+ {
+ if (null !== $privateKey) {
$this->privateKey = $privateKey;
}
+
return $this;
}
/**
- * Set Private Key Password
+ * Set Private Key Password.
+ *
* @param type $privateKeyPassword
- * @return \VersionControl\GitControlBundle\Entity\ProjectEnvironment
+ *
+ * @return SimpleGitEnvironment
*/
- public function setPrivateKeyPassword($privateKeyPassword) {
- if (!is_null($privateKeyPassword)) {
+ public function setPrivateKeyPassword($privateKeyPassword)
+ {
+ if (null !== $privateKeyPassword) {
$this->privateKeyPassword = $privateKeyPassword;
}
+
return $this;
}
-
- public function getPort() {
+
+ public function getPort()
+ {
return 22;
}
-
}
diff --git a/src/VersionControl/GitCommandBundle/Twig/Extension/IsIgnoredExtension.php b/app/src/VersionControl/GitCommandBundle/Twig/Extension/IsIgnoredExtension.php
similarity index 57%
rename from src/VersionControl/GitCommandBundle/Twig/Extension/IsIgnoredExtension.php
rename to app/src/VersionControl/GitCommandBundle/Twig/Extension/IsIgnoredExtension.php
index 626ace6..fe72c08 100644
--- a/src/VersionControl/GitCommandBundle/Twig/Extension/IsIgnoredExtension.php
+++ b/app/src/VersionControl/GitCommandBundle/Twig/Extension/IsIgnoredExtension.php
@@ -1,56 +1,64 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Twig\Extension;
-
-use VersionControl\GitCommandBundle\GitCommands\GitCommand;
-
-/**
- * Twig extension providing filter to get current project environment for project
- *
- * @author Paul Schweppe
- */
-class IsIgnoredExtension extends \Twig_Extension {
-
- /**
- * @var GitCommand
- */
- protected $gitCommand;
-
- public function __construct(GitCommand $gitCommand)
- {
- $this->gitCommand = $gitCommand;
- }
- /**
- * {@inheritDoc}
- */
- public function getName() {
- return 'versioncommand_isignored';
- }
-
- /**
- * {@inheritDoc}
- */
- public function getTests()
- {
- return array(
- new \Twig_SimpleTest('isIgnored', array($this, 'isFileIgnored')),
- );
- }
-
- /**
- *
- * @param string $colorHex
- * @return string
- */
- public function isFileIgnored($filePath) {
- return $this->gitCommand->command('files')->isFileIgnored($filePath);
- }
-
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitCommandBundle\Twig\Extension;
+
+use RuntimeException;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigTest;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitCommandBundle\GitCommands\GitCommand;
+
+/**
+ * Twig extension providing filter to get current project environment for project.
+ *
+ * @author Paul Schweppe
+ */
+class IsIgnoredExtension extends AbstractExtension
+{
+ /**
+ * @var GitCommand
+ */
+ protected $gitCommand;
+
+ public function __construct(GitCommand $gitCommand)
+ {
+ $this->gitCommand = $gitCommand;
+ }
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'versioncommand_isignored';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTests()
+ {
+ return array(
+ new TwigTest('isIgnored', array($this, 'isFileIgnored')),
+ );
+ }
+
+ /**
+ * @param $filePath
+ *
+ * @return string
+ * @throws RunGitCommandException
+ * @throws RuntimeException
+ */
+ public function isFileIgnored($filePath): string
+ {
+ return $this->gitCommand->command('files')->isFileIgnored($filePath);
+ }
+}
diff --git a/src/VersionControl/GitCommandBundle/VersionControlGitCommandBundle.php b/app/src/VersionControl/GitCommandBundle/VersionControlGitCommandBundle.php
similarity index 98%
rename from src/VersionControl/GitCommandBundle/VersionControlGitCommandBundle.php
rename to app/src/VersionControl/GitCommandBundle/VersionControlGitCommandBundle.php
index 5b34b62..89b5e79 100644
--- a/src/VersionControl/GitCommandBundle/VersionControlGitCommandBundle.php
+++ b/app/src/VersionControl/GitCommandBundle/VersionControlGitCommandBundle.php
@@ -1,12 +1,13 @@
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitCommandBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
diff --git a/src/VersionControl/GitControlBundle/Annotation/Driver/ProjectAccessAnnotationDriver.php b/app/src/VersionControl/GitControlBundle/Annotation/Driver/ProjectAccessAnnotationDriver.php
similarity index 61%
rename from src/VersionControl/GitControlBundle/Annotation/Driver/ProjectAccessAnnotationDriver.php
rename to app/src/VersionControl/GitControlBundle/Annotation/Driver/ProjectAccessAnnotationDriver.php
index 6662c4c..32c5d2b 100644
--- a/src/VersionControl/GitControlBundle/Annotation/Driver/ProjectAccessAnnotationDriver.php
+++ b/app/src/VersionControl/GitControlBundle/Annotation/Driver/ProjectAccessAnnotationDriver.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Annotation\Driver;
use Doctrine\Common\Annotations\Reader;
@@ -16,61 +17,62 @@
use Symfony\Component\HttpFoundation\RedirectResponse;
/**
- * Annotation driver to check a user project access rights
- *
+ * Annotation driver to check a user project access rights.
+ *
* @author Paul Schweppe
*/
-class ProjectAccessAnnotationDriver{
-
+class ProjectAccessAnnotationDriver
+{
/**
- * Annotation Reader
- * @var Doctrine\Common\Annotations\Reader
+ * Annotation Reader.
+ *
+ * @var Reader
*/
private $reader;
-
+
/**
- *
- * @param Doctrine\Common\Annotations\Reader $reader
+ * @param Reader $reader
*/
public function __construct($reader)
{
$this->reader = $reader;
}
-
+
/**
- * This event will fire during any controller call
- *
+ * This event will fire during any controller call.
+ *
* @param FilterControllerEvent $event
- * @return type
+ *
* @throws AccessDeniedHttpException
+ * @throws \ReflectionException
*/
public function onKernelController(FilterControllerEvent $event)
{
if (!is_array($controller = $event->getController())) { //return if no controller
return;
}
-
- $object = new \ReflectionObject($controller[0]);// get controller
- $method = $object->getMethod($controller[1]);// get method
+
+ $object = new \ReflectionObject($controller[0]); // get controller
+ $method = $object->getMethod($controller[1]); // get method
$configurations = $this->reader->getMethodAnnotations($method);
-
+
foreach ($configurations as $configuration) { //Start of annotations reading
-
- if(isset($configuration->grantType) && $controller[0] instanceof BaseProjectController){//Found our annotation
+
+ if (isset($configuration->grantType) && $controller[0] instanceof BaseProjectController) {
+ //Found our annotation
$controller[0]->setProjectGrantType($configuration->grantType);
$request = $controller[0]->get('request_stack')->getCurrentRequest();
$id = $request->get('id', false);
- if($id !== false){
- $redirectUrl = $controller[0]->initAction($id,$configuration->grantType);
- if($redirectUrl){
- $event->setController(
- function() use ($redirectUrl) {
- return new RedirectResponse($redirectUrl);
- });
+ if ($id !== false) {
+ $redirectUrl = $controller[0]->initAction($id, $configuration->grantType);
+ if ($redirectUrl) {
+ $event->setController(static function () use ($redirectUrl) {
+ return new RedirectResponse($redirectUrl);
+ });
}
}
- }
- }
+ }
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/VersionControl/GitControlBundle/Annotation/ProjectAccess.php b/app/src/VersionControl/GitControlBundle/Annotation/ProjectAccess.php
similarity index 84%
rename from src/VersionControl/GitControlBundle/Annotation/ProjectAccess.php
rename to app/src/VersionControl/GitControlBundle/Annotation/ProjectAccess.php
index 42b7f95..24856b0 100644
--- a/src/VersionControl/GitControlBundle/Annotation/ProjectAccess.php
+++ b/app/src/VersionControl/GitControlBundle/Annotation/ProjectAccess.php
@@ -1,19 +1,19 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Annotation;
-
-/**
-* @Annotation
-*/
-class ProjectAccess{
-
- public $grantType;
-
-}
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Annotation;
+
+/**
+ * @Annotation
+ */
+class ProjectAccess
+{
+ public $grantType;
+}
diff --git a/src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php b/app/src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php
similarity index 87%
rename from src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php
rename to app/src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php
index d5c0335..e7a384d 100644
--- a/src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php
+++ b/app/src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php
@@ -8,18 +8,18 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
/**
- * Command to create a new admin user for the version control application
- *
+ * Command to create a new admin user for the version control application.
+ *
* @author Paul Schweppe
*/
class CreateAdminCommand extends ContainerAwareCommand
@@ -36,9 +36,9 @@ protected function configure()
new InputArgument('username', InputArgument::REQUIRED, 'The username'),
new InputArgument('email', InputArgument::REQUIRED, 'The email'),
new InputArgument('password', InputArgument::REQUIRED, 'The password'),
- new InputArgument('name', InputArgument::REQUIRED, 'The display name')
+ new InputArgument('name', InputArgument::REQUIRED, 'The display name'),
))
- ->setHelp(<<setHelp(<<<'EOT'
The version:admin:create command creates an administrator user:
php app/console version:admin:create adminname
@@ -55,11 +55,10 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $username = $input->getArgument('username');
- $email = $input->getArgument('email');
- $password = $input->getArgument('password');
- $name = $input->getArgument('name');
-
+ $username = $input->getArgument('username');
+ $email = $input->getArgument('email');
+ $password = $input->getArgument('password');
+ $name = $input->getArgument('name');
$this->createuser($username, $password, $email, $name);
@@ -81,7 +80,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
if (!$input->getArgument('username')) {
$question = new Question('Please choose a username:');
- $question->setValidator(function($username) {
+ $question->setValidator(function ($username) {
if (empty($username)) {
throw new \Exception('Username can not be empty');
}
@@ -93,7 +92,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
if (!$input->getArgument('email')) {
$question = new Question('Please choose an email:');
- $question->setValidator(function($email) {
+ $question->setValidator(function ($email) {
if (empty($email)) {
throw new \Exception('Email can not be empty');
}
@@ -102,12 +101,10 @@ protected function interact(InputInterface $input, OutputInterface $output)
});
$questions['email'] = $question;
}
-
-
if (!$input->getArgument('password')) {
$question = new Question('Please choose a password:');
- $question->setValidator(function($password) {
+ $question->setValidator(function ($password) {
if (empty($password)) {
throw new \Exception('Password can not be empty');
}
@@ -117,10 +114,10 @@ protected function interact(InputInterface $input, OutputInterface $output)
$question->setHidden(true);
$questions['password'] = $question;
}
-
+
if (!$input->getArgument('name')) {
$question = new Question('Please choose a display name:');
- $question->setValidator(function($name) {
+ $question->setValidator(function ($name) {
if (empty($name)) {
throw new \Exception('Display name can not be empty');
}
@@ -138,27 +135,30 @@ protected function interact(InputInterface $input, OutputInterface $output)
/**
* Creates a new admin user.
- *
+ *
* @param string $username
* @param string $password
* @param string $email
* @param string $name
+ *
* @return \FOS\UserBundle\Model\UserInterface
*/
- protected function createUser($username, $password, $email, $name){
+ protected function createUser($username, $password, $email, $name)
+ {
$userManager = $this->getContainer()->get('fos_user.user_manager');
-
+
$user = $userManager->createUser();
$user->setUsername($username);
$user->setEmail($email);
$user->setPlainPassword($password);
$user->setName($name);
-
- $user->setEnabled((Boolean) true);
+
+ $user->setEnabled((bool) true);
$user->addRole('ROLE_ADMIN');
//$user->setSuperAdmin((Boolean) true);
-
+
$userManager->updateUser($user);
+
return $user;
}
}
diff --git a/src/VersionControl/GitControlBundle/Command/InstallerCommand.php b/app/src/VersionControl/GitControlBundle/Command/InstallerCommand.php
similarity index 81%
rename from src/VersionControl/GitControlBundle/Command/InstallerCommand.php
rename to app/src/VersionControl/GitControlBundle/Command/InstallerCommand.php
index b4941e5..c4f0e8e 100644
--- a/src/VersionControl/GitControlBundle/Command/InstallerCommand.php
+++ b/app/src/VersionControl/GitControlBundle/Command/InstallerCommand.php
@@ -7,29 +7,28 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Command;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Exception\ConnectionException;
use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
-
use VersionControl\GitControlBundle\Installer\DatabaseInstall;
/**
- * Command line based installer, Use to install and set up the application
- *
+ * Command line based installer, Use to install and set up the application.
+ *
* @author Paul Schweppe
*/
class InstallerCommand extends Command
{
/** @var \Doctrine\DBAL\Connection */
private $db;
-
+
/** @var \VersionControl\GitControlBundle\Installer\DatabaseInstall */
private $installer;
@@ -48,6 +47,12 @@ class InstallerCommand extends Command
/** @var string */
private $environment;
+ /**
+ * FOS User Manager.
+ *
+ * @var type
+ */
+ private $userManager;
const EXIT_DATABASE_NOT_FOUND_ERROR = 3;
const EXIT_GENERAL_DATABASE_ERROR = 4;
@@ -60,7 +65,8 @@ public function __construct(
CacheClearerInterface $cacheClearer,
Filesystem $filesystem,
$cacheDir,
- $environment
+ $environment,
+ $userManager
) {
$this->db = $db;
$this->installer = $installer;
@@ -68,6 +74,7 @@ public function __construct(
$this->filesystem = $filesystem;
$this->cacheDir = $cacheDir;
$this->environment = $environment;
+ $this->userManager = $userManager;
parent::__construct();
}
@@ -80,16 +87,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
{
$this->output = $output;
$this->installer->setOutput($output);
-
+
$this->checkPermissions();
$this->checkParameters();
$this->checkDatabase();
-
-
$this->installer->importSchema();
- $this->installer->importData();
-
+
+ if ($this->environment == 'test') {
+ $this->installer->importTestData();
+ } else {
+ $this->installer->importData();
+ }
+
$this->cacheClear($output);
}
@@ -110,8 +120,6 @@ private function checkParameters()
}
}
-
-
private function checkDatabase()
{
try {
@@ -122,7 +130,7 @@ private function checkDatabase()
$this->db->getDatabase()
)
);
-
+
exit(self::EXIT_DATABASE_NOT_FOUND_ERROR);
}
} catch (ConnectionException $e) {
@@ -132,7 +140,7 @@ private function checkDatabase()
exit(self::EXIT_GENERAL_DATABASE_ERROR);
}
}
-
+
/**
* @throws \Exception if an unexpected database error occurs
*/
@@ -158,7 +166,7 @@ private function cacheClear(OutputInterface $output)
}
$output->writeln(sprintf('Clearing cache for directory %s ', $this->cacheDir));
- $oldCacheDir = $this->cacheDir . '_old';
+ $oldCacheDir = $this->cacheDir.'_old';
if ($this->filesystem->exists($oldCacheDir)) {
$this->filesystem->remove($oldCacheDir);
@@ -170,4 +178,30 @@ private function cacheClear(OutputInterface $output)
$this->filesystem->remove($oldCacheDir);
}
-}
\ No newline at end of file
+ /**
+ * Creates a new admin user.
+ *
+ * @param string $username
+ * @param string $password
+ * @param string $email
+ * @param string $name
+ *
+ * @return \FOS\UserBundle\Model\UserInterface
+ */
+ protected function createUser($username, $password, $email, $name)
+ {
+ $user = $this->userManager->createUser();
+ $user->setUsername($username);
+ $user->setEmail($email);
+ $user->setPlainPassword($password);
+ $user->setName($name);
+
+ $user->setEnabled((bool) true);
+ $user->addRole('ROLE_ADMIN');
+ //$user->setSuperAdmin((Boolean) true);
+
+ $this->userManager->updateUser($user);
+
+ return $user;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/Admin/IssueLabelAdminController.php b/app/src/VersionControl/GitControlBundle/Controller/Admin/IssueLabelAdminController.php
similarity index 85%
rename from src/VersionControl/GitControlBundle/Controller/Admin/IssueLabelAdminController.php
rename to app/src/VersionControl/GitControlBundle/Controller/Admin/IssueLabelAdminController.php
index 4c8bdc2..eb61287 100644
--- a/src/VersionControl/GitControlBundle/Controller/Admin/IssueLabelAdminController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/Admin/IssueLabelAdminController.php
@@ -14,11 +14,11 @@
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\IssueLabel;
use VersionControl\GitControlBundle\Form\IssueLabelType;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
/**
* IssueLabel controller.
@@ -28,7 +28,6 @@
*/
class IssueLabelAdminController extends Controller
{
-
/**
* Lists all IssueLabel entities.
*
@@ -39,10 +38,10 @@ class IssueLabelAdminController extends Controller
public function indexAction()
{
$em = $this->getDoctrine()->getManager();
- $entities = $em->getRepository('VersionControlGitControlBundle:IssueLabel')->findBy(array('allProjects'=>1));
-
+ $entities = $em->getRepository('VersionControlGitControlBundle:IssueLabel')->findBy(array('allProjects' => 1));
+
return array(
- 'entities' => $entities
+ 'entities' => $entities,
);
}
/**
@@ -69,7 +68,7 @@ public function createAction(Request $request)
return array(
'entity' => $issue,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
);
}
@@ -82,12 +81,12 @@ public function createAction(Request $request)
*/
private function createCreateForm(IssueLabel $issue)
{
- $form = $this->createForm(new IssueLabelType(), $issue, array(
+ $form = $this->createForm(IssueLabelType::class, $issue, array(
'action' => $this->generateUrl('admin_issuelabel_create'),
'method' => 'POST',
));
- $form->add('submit', 'submit', array('label' => 'Create'));
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form;
}
@@ -103,17 +102,15 @@ public function newAction()
{
$issueLabel = new IssueLabel();
- $form = $this->createCreateForm($issueLabel);
+ $form = $this->createCreateForm($issueLabel);
return array(
'entity' => $issueLabel,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
);
}
-
-
/**
* Displays a form to edit an existing IssueLabel entity.
*
@@ -135,31 +132,31 @@ public function editAction($id)
$deleteForm = $this->createDeleteForm($id);
return array(
- 'entity' => $issue,
- 'edit_form' => $editForm->createView(),
+ 'entity' => $issue,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
);
}
/**
- * Creates a form to edit a IssueLabel entity.
- *
- * @param IssueLabel $issue The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a IssueLabel entity.
+ *
+ * @param IssueLabel $issue The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm(IssueLabel $issue)
{
- $form = $this->createForm(new IssueLabelType(), $issue, array(
+ $form = $this->createForm(IssueLabelType::class, $issue, array(
'action' => $this->generateUrl('admin_issuelabel_update', array('id' => $issue->getId())),
'method' => 'PUT',
));
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form;
}
-
+
/**
* Edits an existing IssueLabel entity.
*
@@ -188,8 +185,8 @@ public function updateAction(Request $request, $id)
}
return array(
- 'entity' => $issue,
- 'edit_form' => $editForm->createView(),
+ 'entity' => $issue,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
);
}
@@ -223,6 +220,7 @@ public function deleteAction(Request $request, $id)
* Creates a form to delete a IssueLabel entity by id.
*
* @param mixed $id The entity id
+ *
* @return \Symfony\Component\Form\Form The form
*/
private function createDeleteForm($id)
@@ -230,9 +228,8 @@ private function createDeleteForm($id)
return $this->createFormBuilder()
->setAction($this->generateUrl('admin_issuelabel_delete', array('id' => $id)))
->setMethod('DELETE')
- ->add('submit', 'submit', array('label' => 'Delete'))
+ ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
-
}
diff --git a/app/src/VersionControl/GitControlBundle/Controller/Base/BaseProjectController.php b/app/src/VersionControl/GitControlBundle/Controller/Base/BaseProjectController.php
new file mode 100644
index 0000000..156221b
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Controller/Base/BaseProjectController.php
@@ -0,0 +1,217 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller\Base;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * Base Project controller.
+ *
+ * @abstract
+ */
+abstract class BaseProjectController extends Controller
+{
+ /**
+ * The current Project Entity.
+ *
+ * @var Project
+ */
+ protected $project;
+
+ /**
+ * Array of variables the will be past to the twig templating engine.
+ *
+ * @var array
+ */
+ protected $viewVariables = array();
+
+ /**
+ * The current branch name.
+ *
+ * @var string
+ */
+ protected $branchName;
+
+ /**
+ * @var GitCommand
+ */
+ protected $gitCommands;
+
+ protected $projectGrantType = 'VIEW';
+
+ /**
+ * Allow access by ajax only request.
+ *
+ * @var bool
+ */
+ protected $ajaxOnly = true;
+
+ /**
+ * @param VersionControl\GitControlBundle\Entity\Project $project
+ *
+ * @throws AccessDeniedException
+ */
+ protected function checkProjectAuthorization(
+ \VersionControl\GitControlBundle\Entity\Project $project,
+ $grantType = 'MASTER'
+ ) {
+ $authorizationChecker = $this->get('security.authorization_checker');
+
+ // check for edit access
+ if (false === $authorizationChecker->isGranted($grantType, $project)) {
+ throw new AccessDeniedException();
+ }
+ }
+
+ /**
+ * Generates a URL from the given parameters adding project id.
+ *
+ * @param string $route The name of the route
+ * @param mixed $parameters An array of parameters
+ * @param int $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
+ *
+ * @return string The generated URL
+ *
+ * @see UrlGeneratorInterface
+ */
+ public function generateUrl($route, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
+ {
+ if ($this->project) {
+ $mergedParameters = array_merge(array('id' => $this->project->getId()), $parameters);
+ }
+
+ return parent::generateUrl($route, $mergedParameters, $referenceType);
+ }
+
+ /**
+ * @param int $id
+ */
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $em = $this->getDoctrine()->getManager();
+
+ $this->project = $em->getRepository('VersionControlGitControlBundle:Project')->find($id);
+
+ if (!$this->project) {
+ throw $this->createNotFoundException('Unable to find Project entity.');
+ }
+
+ //Redirect is not ajax
+ $request = $this->container->get('request_stack')->getCurrentRequest();
+
+ //Do not redirect if in test mode
+ if ($this->ajaxOnly == true && !$request->isXmlHttpRequest() && $this->container->getParameter('kernel.environment') != 'test') {
+ return $this->generateUrl('project', array('section' => urlencode($request->getRequestUri())));
+ }
+
+ $this->checkProjectAuthorization($this->project, $grantType);
+
+ $projectEnvironment = $this->getProjectEnvironment();
+
+ $this->gitCommands = $this->get('version_control.git_commands')->setGitEnvironment($projectEnvironment);
+
+ try {
+ $this->branchName = $this->gitCommands->command('branch')->getCurrentBranch();
+ } catch (RunGitCommandException $e) {
+ $this->branchName = '(no branch)';
+ }
+
+ $this->viewVariables = array_merge($this->viewVariables, array(
+ 'project' => $this->project,
+ 'branchName' => $this->branchName,
+ ));
+ }
+
+ /**
+ * Sets the project entity.
+ *
+ * @param Project $project
+ *
+ * @return
+ */
+ public function getProjectEnvironment()
+ {
+ $projectEnvironmentStorage = $this->get('version_control.project_environmnent_storage');
+
+ return $projectEnvironmentStorage->getProjectEnviromment($this->project);
+ }
+
+ /**
+ * Sets the container.
+ *
+ * @param ContainerInterface|null $container A ContainerInterface instance or null
+ */
+ /*public function setContainer(ContainerInterface $container = null){
+ $this->container = $container;
+ $request = $this->container->get('request_stack')->getCurrentRequest();
+ $id = $request->get('id', false);
+ if($id){
+ $grantType = $this->getGrantType();
+ print_r($grantType);
+ $this->initAction($id,$grantType);
+ }
+ }*/
+
+ public function getGrantType()
+ {
+ return $this->projectGrantType;
+ }
+
+ public function getProjectGrantType()
+ {
+ return $this->projectGrantType;
+ }
+
+ public function setProjectGrantType($projectGrantType)
+ {
+ $this->projectGrantType = $projectGrantType;
+
+ return $this;
+ }
+
+ /**
+ * Handle response types.
+ *
+ * @param \Symfony\Component\HttpFoundation\Response|string|array $content
+ * @param string $responseType json|null
+ * @param bool $success
+ *
+ * @return \FlashCardBundle\Controller\Secure\JsonResponse|\Symfony\Component\HttpFoundation\Response
+ */
+ protected function viewHandler($content, $responseType, $success)
+ {
+ if ($responseType === 'json') {
+ $data = ['success' => $success];
+ if (is_array($content)) {
+ $data = array_merge($data, $content);
+ } elseif ($content instanceof \Symfony\Component\HttpFoundation\Response) {
+ $data['form'] = $content->getContent();
+ } else {
+ $data['form'] = $content;
+ }
+
+ return new JsonResponse(
+ $data,
+ ($success ? 200 : 400)
+ );
+ } else {
+ return $content;
+ }
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/DefaultController.php b/app/src/VersionControl/GitControlBundle/Controller/DefaultController.php
similarity index 87%
rename from src/VersionControl/GitControlBundle/Controller/DefaultController.php
rename to app/src/VersionControl/GitControlBundle/Controller/DefaultController.php
index b0a094c..74d4e22 100644
--- a/src/VersionControl/GitControlBundle/Controller/DefaultController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/DefaultController.php
@@ -7,21 +7,16 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-
use Symfony\Component\HttpFoundation\Request;
-/**
- *
- */
class DefaultController extends Controller
{
-
-
/**
* @Route("/", name="home")
* @Template()
@@ -32,13 +27,13 @@ public function listAction(Request $request)
//$projects = $em->getRepository('VersionControlGitControlBundle:Project')->findAll();
$user = $this->get('security.token_storage')->getToken()->getUser();
-
+
//$userProjects = $em->getRepository('VersionControlGitControlBundle:UserProjects')->findByUser($user);
-
+
$keyword = $request->query->get('keyword', false);
-
- $query = $em->getRepository('VersionControlGitControlBundle:UserProjects')->findByUserAndKeyword($user,$keyword,true)->getQuery();
- $paginator = $this->get('knp_paginator');
+
+ $query = $em->getRepository('VersionControlGitControlBundle:UserProjects')->findByUserAndKeyword($user, $keyword, true)->getQuery();
+ $paginator = $this->get('knp_paginator');
$pagination = $paginator->paginate(
$query,
$request->query->getInt('page', 1)/*page number*/,
@@ -48,8 +43,7 @@ public function listAction(Request $request)
return array(
'userProjects' => $pagination,
'user' => $user,
- 'keyword' => $keyword
+ 'keyword' => $keyword,
);
}
-
}
diff --git a/src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php b/app/src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php
similarity index 75%
rename from src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php
rename to app/src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php
index 45d0646..ee2d506 100644
--- a/src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller\Issues;
use Symfony\Component\HttpFoundation\Request;
@@ -15,14 +16,11 @@
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Issues\IssueInterface;
-
use VersionControl\GitControlBundle\Entity\Issues\IssueCommentInteface;
-use VersionControl\GitControlBundle\Form\IssueCommentType;
-
use Symfony\Component\HttpFoundation\JsonResponse;
-
use VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryInterface;
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
/**
* Issue controller.
@@ -31,19 +29,16 @@
*/
class IssueController extends BaseProjectController
{
-
/**
- *
* @var IssueRepositoryInterface
*/
protected $issueRepository;
-
+
/**
- *
* @var \VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryManager;
*/
protected $issueManager;
-
+
/**
* Lists all Issue entities.
*
@@ -54,34 +49,33 @@ class IssueController extends BaseProjectController
*/
public function indexAction($id, Request $request)
{
-
$keyword = $request->query->get('keyword', false);
$filter = $request->query->get('filter', 'open');
-
+
$data = $this->issueRepository->findIssues($keyword, $filter);
//$query = $em->getRepository('VersionControlGitControlBundle:Issue')->findByProjectAndStatus($this->project,$filter,$keyword,null,true)->getQuery();
- $paginator = $this->get('knp_paginator');
+ $paginator = $this->get('knp_paginator');
$pagination = $paginator->paginate(
$data,
$request->query->getInt('page', 1)/*page number*/,
15/*limit per page*/
);
-
+
//$openIssuesCount = $em->getRepository('VersionControlGitControlBundle:Issue')->countIssuesForProjectWithStatus($this->project,'open',$keyword);
//$closedIssuesCount = $em->getRepository('VersionControlGitControlBundle:Issue')->countIssuesForProjectWithStatus($this->project,'closed',$keyword);
- $openIssuesCount = $this->issueRepository->countFindIssues($keyword,'open');
- $closedIssuesCount = $this->issueRepository->countFindIssues($keyword,'closed');
-
+ $openIssuesCount = $this->issueRepository->countFindIssues($keyword, 'open');
+ $closedIssuesCount = $this->issueRepository->countFindIssues($keyword, 'closed');
+
return array_merge($this->viewVariables, array(
//'entities' => $entities,
'openIssuesCount' => $openIssuesCount,
'closedIssuesCount' => $closedIssuesCount,
- 'pagination' => $pagination
-
+ 'pagination' => $pagination,
+
));
}
-
+
/**
* Lists latest Issue entities.
*
@@ -92,10 +86,9 @@ public function indexAction($id, Request $request)
*/
public function latestAction($id, Request $request)
{
-
$data = $this->issueRepository->findIssues('', 'open');
-
- $paginator = $this->get('knp_paginator');
+
+ $paginator = $this->get('knp_paginator');
$pagination = $paginator->paginate(
$data,
$request->query->getInt('page', 1)/*page number*/,
@@ -103,42 +96,38 @@ public function latestAction($id, Request $request)
);
//$openIssuesCount = $em->getRepository('VersionControlGitControlBundle:Issue')->countIssuesForProjectWithStatus($project,'open',false);
-
+
return array_merge($this->viewVariables, array(
//'openIssuesCount' => $openIssuesCount,
- 'pagination' => $pagination
-
+ 'pagination' => $pagination,
+
));
}
-
-
-
+
/**
* Creates a new Issue entity.
*
* @Route("/", name="issue_create")
* @Method("POST")
* @Template("VersionControlGitControlBundle:Issues/Issue:new.html.twig")
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
- public function createAction(Request $request,$id)
+ public function createAction(Request $request, $id)
{
-
$issueEntity = $this->issueRepository->newIssue();
$form = $this->createCreateForm($issueEntity);
$form->handleRequest($request);
if ($form->isValid()) {
-
$issueEntity = $this->issueRepository->createIssue($issueEntity);
- $this->get('session')->getFlashBag()->add('notice', "Issue #".$issueEntity->getId()." successfully updated");
+ $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' successfully updated');
return $this->redirect($this->generateUrl('issues', array('id' => $this->project->getId())));
}
return array_merge($this->viewVariables, array(
'entity' => $issueEntity,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
@@ -153,13 +142,13 @@ private function createCreateForm(IssueInterface $entity)
{
$issueFormType = $this->issueManager->getIssueFormType();
$form = $this->createForm($issueFormType, $entity, array(
- 'action' => $this->generateUrl('issue_create',array('id' => $this->project->getId())),
+ 'action' => $this->generateUrl('issue_create', array('id' => $this->project->getId())),
'method' => 'POST',
'data_class' => get_class($entity), // Where we store our entities
));
- $form->add('submit', 'submit', array('label' => 'Create'));
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form;
}
@@ -170,17 +159,16 @@ private function createCreateForm(IssueInterface $entity)
* @Route("/new/", name="issue_new")
* @Method("GET")
* @Template()
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
public function newAction($id)
{
-
$issueEntity = $this->issueRepository->newIssue();
- $form = $this->createCreateForm($issueEntity);
+ $form = $this->createCreateForm($issueEntity);
return array_merge($this->viewVariables, array(
'entity' => $issueEntity,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
@@ -192,9 +180,8 @@ public function newAction($id)
* @Template()
* @ProjectAccess(grantType="VIEW")
*/
- public function showAction($id,$issueId)
+ public function showAction($id, $issueId)
{
-
$issueEntity = $this->issueRepository->findIssueById($issueId);
if (!$issueEntity) {
@@ -202,15 +189,15 @@ public function showAction($id,$issueId)
}
$deleteForm = $this->createDeleteForm($issueId);
-
+
//@TODO: Needs to update
//$issueComment = new IssueComment();
$issueComment = $this->issueRepository->newIssueComment();
$issueComment->setIssue($issueEntity);
- $commentForm = $this->createCommentForm($issueComment,$issueId);
+ $commentForm = $this->createCommentForm($issueComment, $issueId);
return array_merge($this->viewVariables, array(
- 'entity' => $issueEntity,
+ 'entity' => $issueEntity,
'delete_form' => $deleteForm->createView(),
'comment_form' => $commentForm->createView(),
));
@@ -222,40 +209,39 @@ public function showAction($id,$issueId)
* @Route("/edit/{issueId}", name="issue_edit")
* @Method("GET")
* @Template()
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
- public function editAction($id,$issueId)
+ public function editAction($id, $issueId)
{
-
- $issueEntity = $this->issueRepository->findIssueById($issueId);
+ $issueEntity = $this->issueRepository->findIssueById($issueId);
$editForm = $this->createEditForm($issueEntity);
$deleteForm = $this->createDeleteForm($issueId);
return array_merge($this->viewVariables, array(
- 'issue' => $issueEntity,
- 'edit_form' => $editForm->createView(),
+ 'issue' => $issueEntity,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
));
}
/**
- * Creates a form to edit a Issue entity.
- *
- * @param Issue $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a Issue entity.
+ *
+ * @param Issue $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm(IssueInterface $entity)
{
$issueFormEditType = $this->issueManager->getIssueEditFormType();
$form = $this->createForm($issueFormEditType, $entity, array(
- 'action' => $this->generateUrl('issue_update', array('id'=>$this->project->getId(),'issueId' => $entity->getId())),
+ 'action' => $this->generateUrl('issue_update', array('id' => $this->project->getId(), 'issueId' => $entity->getId())),
'method' => 'PUT',
- 'data_class' => get_class($entity)
+ 'data_class' => get_class($entity),
));
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form;
}
@@ -265,7 +251,7 @@ private function createEditForm(IssueInterface $entity)
* @Route("/{issueId}", name="issue_update")
* @Method("PUT")
* @Template("VersionControlGitControlBundle:Issues/Issue:edit.html.twig")
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
public function updateAction(Request $request, $id, $issueId)
{
@@ -277,15 +263,15 @@ public function updateAction(Request $request, $id, $issueId)
if ($editForm->isValid()) {
$this->issueRepository->updateIssue($issueEntity);
-
- $this->get('session')->getFlashBag()->add('notice', "Issue #".$issueEntity->getId()." successfully updated");
-
- return $this->redirect($this->generateUrl('issue_edit', array('id'=>$this->project->getId(),'issueId' => $issueId)));
+
+ $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' successfully updated');
+
+ return $this->redirect($this->generateUrl('issue_edit', array('id' => $this->project->getId(), 'issueId' => $issueId)));
}
return array_merge($this->viewVariables, array(
- 'entity' => $entity,
- 'edit_form' => $editForm->createView(),
+ 'entity' => $entity,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
));
}
@@ -294,7 +280,7 @@ public function updateAction(Request $request, $id, $issueId)
*
* @Route("/", name="issue_delete")
* @Method("DELETE")
- * @ProjectAccess(grantType="OWNER")
+ * @ProjectAccess(grantType="EDIT")
*/
public function deleteAction(Request $request, $id)
{
@@ -302,18 +288,16 @@ public function deleteAction(Request $request, $id)
$form->handleRequest($request);
if ($form->isValid()) {
-
$issueEntity = $this->issueRepository->findIssueById($issueId);
if (!$issueEntity) {
throw $this->createNotFoundException('Unable to find Issue entity.');
}
-
}
return $this->redirect($this->generateUrl('issue'));
}
-
+
/**
* Displays a form to edit an existing Issue entity.
*
@@ -321,69 +305,63 @@ public function deleteAction(Request $request, $id)
* @Method("GET")
* @ProjectAccess(grantType="EDIT")
*/
- public function closeAction($id,$issueId)
+ public function closeAction($id, $issueId)
{
$issueEntity = $this->issueRepository->closeIssue($issueId);
-
+
if (!$issueEntity) {
throw $this->createNotFoundException('Unable to find Issue entity.');
}
- $this->get('session')->getFlashBag()->add('notice'
- ,"Issue #".$issueEntity->getId()." has been closed");
-
+ $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' has been closed');
+
return $this->redirect($this->generateUrl('issues', array('id' => $this->project->getId())));
}
-
- /**
+
+ /**
* Displays a form to edit an existing Issue entity.
*
- * @Route("/open", name="issue_open")
+ * @Route("/open/{issueId}", name="issue_open")
* @Method("GET")
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="EDIT")
*/
- public function openAction($id)
+ public function openAction($id, $issueId)
{
$issueEntity = $this->issueRepository->reOpenIssue($issueId);
-
+
if (!$issueEntity) {
throw $this->createNotFoundException('Unable to find Issue entity.');
}
- $this->get('session')->getFlashBag()->add('notice'
- ,"Issue #".$issueEntity->getId()." has been closed");
-
-
- return $this->redirect($this->generateUrl('issue_show', array('id'=>$this->project->getId(),'issueId' => $issueEntity->getId())));
+ $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' has been re-opened');
+ return $this->redirect($this->generateUrl('issue_show', array('id' => $this->project->getId(), 'issueId' => $issueEntity->getId())));
}
-
+
/**
* Displays a form to edit an existing Issue entity.
*
* @Route("/hook/", name="issue_hook")
- *
*/
public function hookAction($id)
{
-
$this->gitCommands = $this->get('version_control.git_command')->setProject($this->project);
$message = $this->gitCommands->getLastMessageLog();
-
+
//close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved
//'/#(\d+)/'
$matches = array();
if (preg_match('/(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved) #(\d+)/i', $message, $matches)) {
- foreach($matches as $issueId){
- if(is_numeric($issueId)){
- $issueEntity = $this->issueRepository->findIssueById($issueId);
- if($issue){
+ foreach ($matches as $issueId) {
+ if (is_numeric($issueId)) {
+ $issueEntity = $this->issueRepository->findIssueById($issueId);
+ if ($issue) {
$this->issueRepository->closeIssue($issueId);
- }
+ }
}
}
}
-
+
return new JsonResponse(array('success' => true));
}
@@ -399,12 +377,11 @@ private function createDeleteForm($id)
return $this->createFormBuilder()
->setAction($this->generateUrl('issue_delete', array('id' => $id)))
->setMethod('DELETE')
- ->add('submit', 'submit', array('label' => 'Delete'))
+ ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
-
-
+
/**
* Creates a new Issue comment entity.
*
@@ -413,40 +390,39 @@ private function createDeleteForm($id)
* @Template("VersionControlGitControlBundle:Issues/Issue:show.html.twig")
* @ProjectAccess(grantType="EDIT")
*/
- public function createCommentAction(Request $request,$id, $issueId)
+ public function createCommentAction(Request $request, $id, $issueId)
{
-
$issueComment = $this->issueRepository->newIssueComment();
$issueEntity = $this->issueRepository->findIssueById($issueId);
- $commentForm = $this->createCommentForm($issueComment,$issueId);
+ $commentForm = $this->createCommentForm($issueComment, $issueId);
$commentForm->handleRequest($request);
if ($commentForm->isValid()) {
$issueComment->setIssue($issueEntity);
$issueComment = $this->issueRepository->createIssueComment($issueComment);
//$issueId = $issueComment->getIssue()->getId();
-
- if($commentForm->get('createClose')->isClicked()){
+
+ if ($commentForm->get('createClose')->isClicked()) {
$this->issueRepository->closeIssue($issueId);
}
-
+
// $em->persist($entity);
// $em->flush();
- return $this->redirect($this->generateUrl('issue_show', array('id'=>$this->project->getId(),'issueId' => $issueId)));
+ return $this->redirect($this->generateUrl('issue_show', array('id' => $this->project->getId(), 'issueId' => $issueId)));
}
-
+
$deleteForm = $this->createDeleteForm($issueId);
return array_merge($this->viewVariables, array(
- 'entity' => $issueEntity,
+ 'entity' => $issueEntity,
'delete_form' => $deleteForm->createView(),
'comment_form' => $commentForm->createView(),
));
}
-
+
/**
* Creates a form to create a Issue entity.
*
@@ -458,17 +434,17 @@ private function createCommentForm(IssueCommentInteface $entity, $issueId)
{
$issueCommentType = $this->issueManager->getIssueCommentFormType();
$form = $this->createForm($issueCommentType, $entity, array(
- 'action' => $this->generateUrl('issuecomment_create',array('id'=>$this->project->getId(),'issueId' => $issueId)),
+ 'action' => $this->generateUrl('issuecomment_create', array('id' => $this->project->getId(), 'issueId' => $issueId)),
'method' => 'POST',
'data_class' => get_class($entity),
));
- $form->add('create', 'submit', array('label' => 'Create'));
- $form->add('createClose', 'submit', array('label' => 'Create & Close'));
+ $form->add('create', SubmitType::class, array('label' => 'Create'));
+ $form->add('createClose', SubmitType::class, array('label' => 'Create & Close'));
return $form;
}
-
+
/**
* Displays a form to edit an existing Issue entity.
*
@@ -476,48 +452,42 @@ private function createCommentForm(IssueCommentInteface $entity, $issueId)
* @Method("GET")
* @ProjectAccess(grantType="VIEW")
*/
- public function searchAjaxAction($id,Request $request)
+ public function searchAjaxAction($id, Request $request)
{
-
$keyword = $request->query->get('keyword', false);
$filter = $request->query->get('filter', 'open');
-
- if($keyword && is_numeric($keyword)){
+
+ if ($keyword && is_numeric($keyword)) {
$data = array();
//Get issue by id
- try{
+ try {
$issue = $this->issueRepository->findIssueById($keyword);
- if($issue){
+ if ($issue) {
$data[] = $issue;
}
- }catch(\Exception $e){
+ } catch (\Exception $e) {
//return new JsonResponse(array('success' => false, 'error' => $result));
}
- }else{
+ } else {
$data = $this->issueRepository->findIssues($keyword, $filter);
}
//$issueEntities = $em->getRepository('VersionControlGitControlBundle:Issue')->findByProjectAndStatus($project,$filter,$keyword,null,false);
-
- if($data instanceof \Doctrine\ORM\QueryBuilder){
-
+
+ if ($data instanceof \Doctrine\ORM\QueryBuilder) {
$issueEntities = $data->getQuery()->getResult();
- }else{
+ } else {
$issueEntities = $data;
}
$result = [];
- foreach($issueEntities as $issueEntity){
+ foreach ($issueEntities as $issueEntity) {
$result[] = array(
- 'id' => $issueEntity->getId()
- ,'title' => $issueEntity->getTitle()
- ,'description' => $issueEntity->getDescription()
- ,'status' => $issueEntity->getStatus()
- ,'author' => $issueEntity->getUser()->getName()
+ 'id' => $issueEntity->getId(), 'title' => $issueEntity->getTitle(), 'description' => $issueEntity->getDescription(), 'status' => $issueEntity->getStatus(), 'author' => $issueEntity->getUser()->getName(),
);
}
-
+
return new JsonResponse(array('success' => true, 'results' => $result));
}
-
+
/**
* Displays a form to edit an existing Issue entity.
*
@@ -526,7 +496,7 @@ public function searchAjaxAction($id,Request $request)
* @TODO Pass in project id
* @ProjectAccess(grantType="VIEW")
*/
- public function findAjaxAction($id,$issueId = '')
+ public function findAjaxAction($id, $issueId = '')
{
//$em = $this->getDoctrine()->getManager();
//$issueEntity = $em->getRepository('VersionControlGitControlBundle:Issue')->find($issueId);
@@ -535,16 +505,12 @@ public function findAjaxAction($id,$issueId = '')
return new JsonResponse(array('success' => false, 'error' => 'No issue exists matching this id.'));
}
$result = array(
- 'id' => $issueEntity->getId()
- ,'title' => $issueEntity->getTitle()
- ,'description' => $issueEntity->getDescription()
- ,'status' => $issueEntity->getStatus()
+ 'id' => $issueEntity->getId(), 'title' => $issueEntity->getTitle(), 'description' => $issueEntity->getDescription(), 'status' => $issueEntity->getStatus(),
);
-
- return new JsonResponse(array('success' => true, 'result' => $result));
+ return new JsonResponse(array('success' => true, 'result' => $result));
}
-
+
/**
* Finds and displays a Issue entity.
*
@@ -553,9 +519,8 @@ public function findAjaxAction($id,$issueId = '')
* @Template()
* @ProjectAccess(grantType="VIEW")
*/
- public function showModalAction($id,$issueId)
+ public function showModalAction($id, $issueId)
{
-
$issueEntity = $this->issueRepository->findIssueById($issueId);
if (!$issueEntity) {
@@ -563,32 +528,30 @@ public function showModalAction($id,$issueId)
}
return array(
- 'entity' => $issueEntity,
+ 'entity' => $issueEntity,
'project' => $this->project,
);
}
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
- public function initAction($id,$grantType='VIEW'){
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
return $redirectUrl;
}
-
+
$em = $this->getDoctrine()->getManager();
- $issueIntegrator= $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
-
+ $issueIntegrator = $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
+
$this->issueManager = $this->get('version_control.issue_repository_manager');
- if($issueIntegrator){
+ if ($issueIntegrator) {
$this->issueManager->setIssueIntegrator($issueIntegrator);
- }else{
+ } else {
$this->issueManager->setProject($this->project);
}
$this->issueRepository = $this->issueManager->getIssueRepository();
-
}
-
}
diff --git a/src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php b/app/src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php
similarity index 77%
rename from src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php
rename to app/src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php
index 0a3fec1..78d48bd 100644
--- a/src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php
@@ -7,17 +7,17 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller\Issues;
use Symfony\Component\HttpFoundation\Request;
use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Issues\IssueLabelInterface;
-use VersionControl\GitControlBundle\Form\IssueLabelType;
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
/**
* IssueLabel controller.
@@ -26,19 +26,16 @@
*/
class IssueLabelController extends BaseProjectController
{
-
/**
- *
* @var IssueLabelRepositoryInterface
*/
protected $issueLabelRepository;
-
+
/**
- *
* @var \VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryManager;
*/
protected $issueManager;
-
+
/**
* Lists all IssueLabel entities.
*
@@ -49,9 +46,8 @@ class IssueLabelController extends BaseProjectController
*/
public function indexAction($id)
{
-
$issueLabels = $this->issueLabelRepository->listLabels();
-
+
return array_merge($this->viewVariables, array(
'entities' => $issueLabels,
));
@@ -64,9 +60,8 @@ public function indexAction($id)
* @Template("VersionControlGitControlBundle:IssueLabel:new.html.twig")
* @ProjectAccess(grantType="EDIT")
*/
- public function createAction(Request $request,$id)
+ public function createAction(Request $request, $id)
{
-
$issueLabel = $this->issueLabelRepository->newLabel();
$form = $this->createCreateForm($issueLabel);
$form->handleRequest($request);
@@ -74,16 +69,16 @@ public function createAction(Request $request,$id)
if ($form->isValid()) {
$issueLabel = $this->issueLabelRepository->createLabel($issueLabel);
- $this->get('session')->getFlashBag()->add('notice', "New Issue label Created ".$issueLabel->getId().".");
-
- $this->get('session')->getFlashBag()->add('info', "It may take a minute or two before you can see the new label in the list below");
-
+ $this->get('session')->getFlashBag()->add('notice', 'New Issue label Created '.$issueLabel->getId().'.');
+
+ $this->get('session')->getFlashBag()->add('info', 'It may take a minute or two before you can see the new label in the list below');
+
return $this->redirect($this->generateUrl('issuelabels', array('id' => $this->project->getId())));
}
return array_merge($this->viewVariables, array(
'entity' => $issueLabel,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
@@ -102,7 +97,7 @@ private function createCreateForm(IssueLabelInterface $issueLabel)
'method' => 'POST',
));
- $form->add('submit', 'submit', array('label' => 'Create'));
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form;
}
@@ -117,29 +112,25 @@ private function createCreateForm(IssueLabelInterface $issueLabel)
*/
public function newAction($id)
{
-
$issueLabel = $this->issueLabelRepository->newLabel();
- $form = $this->createCreateForm($issueLabel);
+ $form = $this->createCreateForm($issueLabel);
return array_merge($this->viewVariables, array(
'entity' => $issueLabel,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
-
-
/**
* Displays a form to edit an existing IssueLabel entity.
*
* @Route("/edit/{labelId}", name="issuelabel_edit")
* @Method("GET")
* @Template()
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
- public function editAction($id,$labelId)
+ public function editAction($id, $labelId)
{
-
$issueLabel = $this->issueLabelRepository->findLabelById($labelId);
if (!$issueLabel) {
@@ -149,27 +140,27 @@ public function editAction($id,$labelId)
$editForm = $this->createEditForm($issueLabel);
return array_merge($this->viewVariables, array(
- 'entity' => $issueLabel,
- 'edit_form' => $editForm->createView(),
+ 'entity' => $issueLabel,
+ 'edit_form' => $editForm->createView(),
));
}
/**
- * Creates a form to edit a IssueLabel entity.
- *
- * @param IssueLabel $issue The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a IssueLabel entity.
+ *
+ * @param IssueLabel $issue The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm(IssueLabelInterface $issue)
{
$issueLabelFormType = $this->issueManager->getIssueLabelFormType();
$form = $this->createForm($issueLabelFormType, $issue, array(
- 'action' => $this->generateUrl('issuelabel_update', array('labelId' => $issue->getId(),'id' => $this->project->getId())),
+ 'action' => $this->generateUrl('issuelabel_update', array('labelId' => $issue->getId(), 'id' => $this->project->getId())),
'method' => 'PUT',
));
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form;
}
@@ -179,11 +170,10 @@ private function createEditForm(IssueLabelInterface $issue)
* @Route("/{labelId}", name="issuelabel_update")
* @Method("PUT")
* @Template("VersionControlGitControlBundle:IssueLabel:edit.html.twig")
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
public function updateAction(Request $request, $id, $labelId)
{
-
$issueLabel = $this->issueLabelRepository->findLabelById($labelId);
if (!$issueLabel) {
@@ -194,18 +184,17 @@ public function updateAction(Request $request, $id, $labelId)
$editForm->handleRequest($request);
if ($editForm->isValid()) {
-
$this->issueLabelRepository->updateLabel($issueLabel);
-
+
$this->get('session')->getFlashBag()->add('notice', "Issue label Update '".$issueLabel->getId()."'.");
//$this->get('session')->getFlashBag()->add('info', "It may take a minute or two before you can see the updated label in the list below");
-
+
return $this->redirect($this->generateUrl('issuelabels', array('id' => $this->project->getId())));
}
return array_merge($this->viewVariables, array(
- 'entity' => $issueLabel,
- 'edit_form' => $editForm->createView(),
+ 'entity' => $issueLabel,
+ 'edit_form' => $editForm->createView(),
));
}
/**
@@ -216,38 +205,35 @@ public function updateAction(Request $request, $id, $labelId)
*/
public function deleteAction($id, $labelId)
{
-
- if ($labelId){
- $this->issueLabelRepository->deleteLabel($labelId);
+ if ($labelId) {
+ $this->issueLabelRepository->deleteLabel($labelId);
}
-
+
$this->get('session')->getFlashBag()->add('notice', "Issue label '".$labelId."' has been deleted");
- return $this->redirect($this->generateUrl('issuelabels',array('id' => $this->project->getId())));
+ return $this->redirect($this->generateUrl('issuelabels', array('id' => $this->project->getId())));
}
-
/**
- *
- * @param integer $id
+ * @param int $id
*/
- public function initAction($id,$grantType='VIEW'){
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
return $redirectUrl;
}
-
+
$em = $this->getDoctrine()->getManager();
- $issueIntegrator= $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
-
+ $issueIntegrator = $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
+
$this->issueManager = $this->get('version_control.issue_repository_manager');
- if($issueIntegrator){
+ if ($issueIntegrator) {
$this->issueManager->setIssueIntegrator($issueIntegrator);
- }else{
+ } else {
$this->issueManager->setProject($this->project);
}
$this->issueLabelRepository = $this->issueManager->getIssueLabelRepository();
-
}
}
diff --git a/src/VersionControl/GitControlBundle/Controller/Issues/IssueMilestoneController.php b/app/src/VersionControl/GitControlBundle/Controller/Issues/IssueMilestoneController.php
similarity index 73%
rename from src/VersionControl/GitControlBundle/Controller/Issues/IssueMilestoneController.php
rename to app/src/VersionControl/GitControlBundle/Controller/Issues/IssueMilestoneController.php
index aeb90a6..2c08ddf 100644
--- a/src/VersionControl/GitControlBundle/Controller/Issues/IssueMilestoneController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/Issues/IssueMilestoneController.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller\Issues;
use Symfony\Component\HttpFoundation\Request;
@@ -16,6 +17,7 @@
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Issues\IssueMilestoneInterface;
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
/**
* IssueMilestone controller.
@@ -24,20 +26,16 @@
*/
class IssueMilestoneController extends BaseProjectController
{
-
/**
- *
* @var IssueMilestoneRepositoryInterface
*/
protected $issueMilestoneRepository;
-
+
/**
- *
* @var \VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryManager;
*/
protected $issueManager;
-
-
+
/**
* Lists all IssueMilestone entities.
*
@@ -48,31 +46,25 @@ class IssueMilestoneController extends BaseProjectController
*/
public function indexAction($id, Request $request)
{
-
-
$filter = $request->query->get('filter', 'open');
-
+
$data = $this->issueMilestoneRepository->listMilestones($filter);
-
- $paginator = $this->get('knp_paginator');
+
+ $paginator = $this->get('knp_paginator');
$pagination = $paginator->paginate(
$data,
$request->query->getInt('page', 1)/*page number*/,
15/*limit per page*/
);
-
$openCount = $this->issueMilestoneRepository->countMilestones('open');
$closedCount = $this->issueMilestoneRepository->countMilestones('closed');
-
return array_merge($this->viewVariables, array(
'openCount' => $openCount,
'closedCount' => $closedCount,
- 'pagination' => $pagination
+ 'pagination' => $pagination,
));
-
-
}
/**
* Creates a new IssueMilestone entity.
@@ -80,26 +72,25 @@ public function indexAction($id, Request $request)
* @Route("/", name="issuemilestone_create")
* @Method("POST")
* @Template("VersionControlGitControlBundle:Issues/IssueMilestone:new.html.twig")
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
- public function createAction(Request $request,$id)
- {
-
+ public function createAction(Request $request, $id)
+ {
$issueMilestone = $this->issueMilestoneRepository->newMilestone();
$form = $this->createCreateForm($issueMilestone);
$form->handleRequest($request);
if ($form->isValid()) {
$issueMilestone = $this->issueMilestoneRepository->createMilestone($issueMilestone);
-
+
$this->get('session')->getFlashBag()->add('notice', 'New Milestone:'.$issueMilestone->getTitle());
- return $this->redirect($this->generateUrl('issuemilestone_show', array('id' => $issueMilestone->getId())));
+ return $this->redirect($this->generateUrl('issuemilestone_show', array('milestoneId' => $issueMilestone->getId())));
}
return array_merge($this->viewVariables, array(
'entity' => $issueMilestone,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
@@ -114,11 +105,11 @@ private function createCreateForm(IssueMilestoneInterface $entity)
{
$issueLMilestoneFormType = $this->issueManager->getIssueMilestoneFormType();
$form = $this->createForm($issueLMilestoneFormType, $entity, array(
- 'action' => $this->generateUrl('issuemilestone_create',array('id'=>$this->project->getId())),
+ 'action' => $this->generateUrl('issuemilestone_create', array('id' => $this->project->getId())),
'method' => 'POST',
));
- $form->add('submit', 'submit', array('label' => 'Create'));
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form;
}
@@ -129,18 +120,16 @@ private function createCreateForm(IssueMilestoneInterface $entity)
* @Route("/new/", name="issuemilestone_new")
* @Method("GET")
* @Template()
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
public function newAction($id)
{
-
-
$issueMilestone = $this->issueMilestoneRepository->newMilestone();
- $form = $this->createCreateForm($issueMilestone);
+ $form = $this->createCreateForm($issueMilestone);
return array_merge($this->viewVariables, array(
'entity' => $issueMilestone,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
@@ -152,10 +141,8 @@ public function newAction($id)
* @Template()
* @ProjectAccess(grantType="VIEW")
*/
- public function showAction($id,$milestoneId)
+ public function showAction($id, $milestoneId)
{
-
-
$issueMilestone = $this->issueMilestoneRepository->findMilestoneById($milestoneId);
if (!$issueMilestone) {
@@ -163,14 +150,14 @@ public function showAction($id,$milestoneId)
}
$deleteForm = $this->createDeleteForm($id);
-
+
$issueRepository = $this->issueManager->getIssueRepository();
-
- $openIssuesCount = $issueRepository->countIssuesInMilestones($milestoneId,'open');
- $closedIssuesCount = $issueRepository->countIssuesInMilestones($milestoneId,'closed');
-
+
+ $openIssuesCount = $issueRepository->countIssuesInMilestones($milestoneId, 'open');
+ $closedIssuesCount = $issueRepository->countIssuesInMilestones($milestoneId, 'closed');
+
return array_merge($this->viewVariables, array(
- 'entity' => $issueMilestone,
+ 'entity' => $issueMilestone,
'delete_form' => $deleteForm->createView(),
'openCount' => $openIssuesCount,
'closedCount' => $closedIssuesCount,
@@ -183,12 +170,10 @@ public function showAction($id,$milestoneId)
* @Route("/edit/{milestoneId}", name="issuemilestone_edit")
* @Method("GET")
* @Template()
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
- public function editAction($id,$milestoneId)
+ public function editAction($id, $milestoneId)
{
-
-
$issueMilestone = $this->issueMilestoneRepository->findMilestoneById($milestoneId);
if (!$issueMilestone) {
@@ -199,28 +184,28 @@ public function editAction($id,$milestoneId)
$deleteForm = $this->createDeleteForm($id);
return array_merge($this->viewVariables, array(
- 'milestone' => $issueMilestone,
- 'edit_form' => $editForm->createView(),
+ 'milestone' => $issueMilestone,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
));
}
/**
- * Creates a form to edit a IssueMilestone entity.
- *
- * @param IssueMilestone $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a IssueMilestone entity.
+ *
+ * @param IssueMilestone $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm(IssueMilestoneInterface $entity)
{
$issueLMilestoneFormType = $this->issueManager->getIssueMilestoneFormType();
$form = $this->createForm($issueLMilestoneFormType, $entity, array(
- 'action' => $this->generateUrl('issuemilestone_update', array('id'=> $this->project->getId(), 'milestoneId' => $entity->getId())),
+ 'action' => $this->generateUrl('issuemilestone_update', array('id' => $this->project->getId(), 'milestoneId' => $entity->getId())),
'method' => 'PUT',
));
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form;
}
@@ -230,14 +215,11 @@ private function createEditForm(IssueMilestoneInterface $entity)
* @Route("/{milestoneId}", name="issuemilestone_update")
* @Method("PUT")
* @Template("VersionControlGitControlBundle:Issues/IssueMilestone:edit.html.twig")
- * @ProjectAccess(grantType="EDIT")
+ * @ProjectAccess(grantType="VIEW")
*/
public function updateAction(Request $request, $id, $milestoneId)
{
-
-
$issueMilestone = $this->issueMilestoneRepository->findMilestoneById($milestoneId);
-
if (!$issueMilestone) {
throw $this->createNotFoundException('Unable to find IssueMilestone entity.');
@@ -250,12 +232,13 @@ public function updateAction(Request $request, $id, $milestoneId)
if ($editForm->isValid()) {
$this->issueMilestoneRepository->updateMilestone($issueMilestone);
$this->get('session')->getFlashBag()->add('notice', 'Updated Milestone:'.$issueMilestone->getTitle());
- return $this->redirect($this->generateUrl('issuemilestone_edit', array('id' => $id, 'milestoneId' => $milestoneId)));
+
+ return $this->redirect($this->generateUrl('issuemilestone_show', array('id' => $id, 'milestoneId' => $milestoneId)));
}
return array_merge($this->viewVariables, array(
- 'entity' => $issueMilestone,
- 'edit_form' => $editForm->createView(),
+ 'entity' => $issueMilestone,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
));
}
@@ -268,8 +251,6 @@ public function updateAction(Request $request, $id, $milestoneId)
*/
public function deleteAction(Request $request, $id, $milestoneId)
{
-
-
$form = $this->createDeleteForm($id);
$form->handleRequest($request);
@@ -277,10 +258,9 @@ public function deleteAction(Request $request, $id, $milestoneId)
$this->issueMilestoneRepository->deleteMilestone($milestoneId);
$this->get('session')->getFlashBag()->add('notice', 'Deleted Milestone:'.$milestoneId);
-
}
- return $this->redirect($this->generateUrl('issuemilestones',array('id'=> $id)));
+ return $this->redirect($this->generateUrl('issuemilestones', array('id' => $id)));
}
/**
@@ -293,13 +273,13 @@ public function deleteAction(Request $request, $id, $milestoneId)
private function createDeleteForm($id)
{
return $this->createFormBuilder()
- ->setAction($this->generateUrl('issuemilestone_delete', array('id' => $this->project->getId(),'milestoneId'=>$id)))
+ ->setAction($this->generateUrl('issuemilestone_delete', array('id' => $this->project->getId(), 'milestoneId' => $id)))
->setMethod('DELETE')
- ->add('submit', 'submit', array('label' => 'Delete'))
+ ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
-
+
/**
* Displays a form to edit an existing Issue entity.
*
@@ -307,66 +287,68 @@ private function createDeleteForm($id)
* @Method("GET")
* @ProjectAccess(grantType="EDIT")
*/
- public function closeAction($id,$milestoneId)
+ public function closeAction($id, $milestoneId)
{
-
-
$issueMilestone = $this->issueMilestoneRepository->closeMilestone($milestoneId);
-
+
if (!$issueMilestone) {
throw $this->createNotFoundException('Unable to find Issue Milestone entity.');
}
-
- $this->get('session')->getFlashBag()->add('notice'
- ,"Milestone #".$issueMilestone->getId()." has been closed");
-
+
+ $this->get('session')->getFlashBag()->add('notice', 'Milestone #'.$issueMilestone->getId().' has been closed');
+
return $this->redirect($this->generateUrl('issuemilestones', array('project' => $issueMilestone->getProject()->getId())));
}
-
- /**
+
+ /**
* Displays a form to edit an existing Issue entity.
*
* @Route("/open/{milestoneId}", name="issuemilestone_open")
* @Method("GET")
* @ProjectAccess(grantType="EDIT")
*/
- public function openAction($id,$milestoneId)
+ public function openAction($id, $milestoneId)
{
-
$issueMilestone = $this->issueMilestoneRepository->reOpenMilestone($milestoneId);
if (!$issueMilestone) {
throw $this->createNotFoundException('Unable to find Issue Milestone entity.');
}
-
- $this->get('session')->getFlashBag()->add('notice'
- ,"Milestone #".$issueMilestone->getId()." has been opened");
-
- return $this->redirect($this->generateUrl('issuemilestone_show', array('id'=>$this->project, 'milestoneId' => $issueMilestone->getId())));
+ $this->get('session')->getFlashBag()->add('notice', 'Milestone #'.$issueMilestone->getId().' has been opened');
+
+ return $this->redirect($this->generateUrl('issuemilestone_show', array('id' => $this->project->getId(), 'milestoneId' => $issueMilestone->getId())));
}
-
+
/**
* Lists all Issue entities.
*
* @Template()
- *
*/
- public function milestonesIssuesAction(Request $request,$id,$issueMilestone,$filter = 'open',$pageParameterName='page',$keywordParamaterName='keyword')
+ public function milestonesIssuesAction(Request $request, $id, $issueMilestone, $filter = 'open', $pageParameterName = 'page', $keywordParamaterName = 'keyword')
{
-
- $parentRequest = $request->createFromGlobals();
+ $em = $this->getDoctrine()->getManager();
+
+ $this->project = $em->getRepository('VersionControlGitControlBundle:Project')->find($id);
+
+ if (!$this->project) {
+ throw $this->createNotFoundException('Unable to find Project entity.');
+ }
+
+ $this->initIssueMilestoneRepository($this->project);
+
+ $parentRequest = $request->createFromGlobals();
$keyword = $parentRequest->query->get($keywordParamaterName, false);
-
+
$issueRepository = $this->issueManager->getIssueRepository();
- $data = $issueRepository->findIssuesInMilestones($issueMilestone->getId(),$filter,$keyword);
-
+ $data = $issueRepository->findIssuesInMilestones($issueMilestone->getId(), $filter, $keyword);
+
//$data = $em->getRepository('VersionControlGitControlBundle:Issue')->findByProjectAndStatus($issueMilestone->getProject(),$filter,$keyword,$issueMilestone,true)->getQuery();
- $paginator = $this->get('knp_paginator');
+ $paginator = $this->get('knp_paginator');
$pagination = $paginator->paginate(
$data,
$parentRequest->query->getInt($pageParameterName, 1)/*page number*/,
- 10,/*limit per page*/
+ 10, /*limit per page*/
array('pageParameterName' => $pageParameterName)
);
@@ -375,33 +357,47 @@ public function milestonesIssuesAction(Request $request,$id,$issueMilestone,$fil
'pagination' => $pagination,
'status' => $filter,
'keywordParamaterName' => $keywordParamaterName,
- 'keyword' => $keyword
-
-
+ 'keyword' => $keyword,
+ 'project' => $this->project,
+
));
}
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
- public function initAction($id,$grantType='VIEW'){
+ public function initAction($id, $grantType = 'VIEW')
+ {
$em = $this->getDoctrine()->getManager();
-
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
+
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
return $redirectUrl;
}
-
- $issueIntegrator= $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
-
+
+ $issueIntegrator = $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
+
$this->issueManager = $this->get('version_control.issue_repository_manager');
- if($issueIntegrator){
+ if ($issueIntegrator) {
$this->issueManager->setIssueIntegrator($issueIntegrator);
- }else{
+ } else {
$this->issueManager->setProject($this->project);
}
$this->issueMilestoneRepository = $this->issueManager->getIssueMilestoneRepository();
-
+ }
+
+ protected function initIssueMilestoneRepository($project)
+ {
+ $em = $this->getDoctrine()->getManager();
+
+ $issueIntegrator = $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($project);
+
+ $this->issueManager = $this->get('version_control.issue_repository_manager');
+ if ($issueIntegrator) {
+ $this->issueManager->setIssueIntegrator($issueIntegrator);
+ } else {
+ $this->issueManager->setProject($project);
+ }
+ $this->issueMilestoneRepository = $this->issueManager->getIssueMilestoneRepository();
}
}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php
similarity index 79%
rename from src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php
index d03077e..f3974cc 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php
@@ -1,347 +1,343 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace VersionControl\GitControlBundle\Controller;
-
-use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\HttpFoundation\Request;
-use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-
-/**
- * Project controller.
- *
- * @Route("/project/{id}/branch")
- */
-class ProjectBranchController extends BaseProjectController {
-
- /**
- * List Branches. Not sure how to list remote and local branches.
- *
- * @Route("es/{newBranchName}", name="project_branches")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="VIEW")
- */
- public function branchesAction($id, $newBranchName = false) {
-
- $this->initListingView();
-
- $defaultData = array();
- if ($newBranchName !== false) {
- $defaultData['name'] = $newBranchName;
- }
-
- $form = $this->createNewBranchForm($this->project, $defaultData);
-
- return array_merge($this->viewVariables, array(
- 'form' => $form->createView(),
- 'newBranchName' => $newBranchName,
- ));
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("/create/", name="project_branch")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectBranch:branches.html.twig")
- * @ProjectAccess(grantType="EDIT")
- */
- public function createBranchAction(Request $request, $id) {
-
-
- $form = $this->createNewBranchForm($this->project);
- $form->handleRequest($request);
-
- if ($form->isValid()) {
- $data = $form->getData();
- $newBranchName = $data['name'];
- $switchToBranch = $data['switch'];
- try {
-
- $response = $this->gitCommands->command('branch')->createLocalBranch($newBranchName, $switchToBranch);
- $this->get('session')->getFlashBag()->add('notice', $response);
- return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
- } catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- }
-
- $this->initListingView();
-
- return array_merge($this->viewVariables, array(
- 'form' => $form->createView(),
- 'newBranchName' => false,
- ));
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("/checkoutbranch/{branchName}", name="project_checkoutbranch" , requirements={"branchName"=".+"})
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:Project:branches.html.twig")
- * @ProjectAccess(grantType="EDIT")
- */
- public function checkoutBranchAction($id, $branchName) {
-
- try {
- $response = $this->gitCommands->command('branch')->checkoutBranch($branchName);
-
- $this->get('session')->getFlashBag()->add('notice', $response);
- } catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
- }
-
- /**
- * List Branches. Not sure how to list remote and local branches.
- *
- * @Route("/remotes", name="project_branch_remotes")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="VIEW")
- */
- public function remoteBranchesAction($id) {
-
- $branchName = $this->gitCommands->command('branch')->getCurrentBranch();
-
- //Remote Server choice
- $gitRemoteBranches = $this->gitCommands->command('branch')->getBranchRemoteListing();
-
- $form = $this->createNewBranchForm($this->project, array(), 'project_branch_remote_checkout');
- $form->add('remotename', 'hidden', array(
- 'label' => 'Remote Branch Name'
- , 'required' => true
- , 'constraints' => array(
- new NotBlank()
- ))
- );
-
- return array_merge($this->viewVariables, array(
- 'branches' => $gitRemoteBranches,
- 'branchName' => $branchName,
- 'form' => $form->createView(),
- ));
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("/checkout-remote", name="project_branch_remote_checkout")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectBranch:remoteBranches.html.twig")
- * @ProjectAccess(grantType="EDIT")
- */
- public function checkoutRemoteBranchAction(Request $request, $id) {
-
- $branchName = $this->gitCommands->command('branch')->getCurrentBranch();
- $gitRemoteBranches = $this->gitCommands->command('branch')->getBranchRemoteListing();
-
- $form = $this->createNewBranchForm($this->project, array(), 'project_branch_remote_checkout');
- $form->add('remotename', 'hidden', array(
- 'label' => 'Remote Branch Name'
- , 'required' => true
- , 'constraints' => array(
- new NotBlank()
- ))
- );
-
- $form->handleRequest($request);
-
- if ($form->isValid()) {
- $data = $form->getData();
- $newBranchName = $data['name'];
- $remoteBranchName = $data['remotename'];
- $switchToBranch = $data['switch'];
-
- try {
- $response = $this->gitCommands->command('branch')->createBranchFromRemote($newBranchName, $remoteBranchName, $switchToBranch);
- $this->get('session')->getFlashBag()->add('notice', $response);
- return $this->redirect($this->generateUrl('project_branch_remotes', array('id' => $id)));
- } catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- }
-
- return array_merge($this->viewVariables, array(
- 'branches' => $gitRemoteBranches,
- 'branchName' => $branchName,
- 'form' => $form->createView(),
- ));
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("/fetchall/", name="project_branch_fetchall")
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:ProjectBranch:remoteBranches.html.twig")
- * @ProjectAccess(grantType="EDIT")
- */
- public function fetchAllAction($id) {
-
- try {
- $response = $this->gitCommands->command('branch')->fetchAll();
- $this->get('session')->getFlashBag()->add('notice', $response);
- } catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_branch_remotes', array('id' => $id)));
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("/deletebranch/{branchName}", name="project_deletebranch" , requirements={"branchName"=".+"})
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:Project:branches.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function deleteBranchAction($id, $branchName) {
-
- try {
- $response = $this->gitCommands->command('branch')->deleteBranch($branchName);
-
- $this->get('session')->getFlashBag()->add('notice', $response);
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
- }
-
- /**
- * Creates a form to edit a Project entity.
- *
- * @param Project $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createNewBranchForm($project, $defaultData = array(), $formAction = 'project_branch') {
-
- //$defaultData = array();
- $form = $this->createFormBuilder($defaultData, array(
- 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
- 'method' => 'POST',
- ))
- ->add('name', 'text', array(
- 'label' => 'Branch Name'
- , 'required' => true
- , 'constraints' => array(
- new NotBlank()
- ))
- )
- ->add('switch', 'checkbox', array(
- 'label' => 'Switch to branch on creation'
- , 'required' => false
- )
- )
- ->getForm();
-
- $form->add('submit', 'submit', array('label' => 'Create'));
- return $form;
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("/mergebranch/{branchName}", name="project_mergebranch" , requirements={"branchName"=".+"})
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:Project:branches.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function mergeBranchAction($id, $branchName) {
- try {
- $response = $this->gitCommands->command('branch')->mergeBranch($branchName);
- $this->get('session')->getFlashBag()->add('notice', $response);
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_branches'));
- }
-
- private function getBranchesToMerge() {
-
- $gitLocalBranches = $this->gitCommands->command('branch')->getBranches(true);
- $currentbranchName = $this->gitCommands->command('branch')->getCurrentBranch();
- $mergeBranches = array();
- foreach ($gitLocalBranches as $branchName) {
- if ($branchName !== $currentbranchName) {
- $mergeBranches[$branchName] = $branchName;
- }
- }
-
- return $mergeBranches;
- }
-
- /**
- * Creates a form to edit a Project entity.
- *
- * @param Project $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createMergeBranchForm($project, $branches, $formAction = 'project_mergebranch') {
-
- $defaultData = array();
- $form = $this->createFormBuilder($defaultData, array(
- 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
- 'method' => 'POST',
- ))
- ->add('branch', 'choice', array(
- 'choices' => $branches
- , 'label' => 'Branch Name'
- , 'required' => true
- , 'choices_as_values' => true
- , 'constraints' => array(
- new NotBlank()
- ))
- )
- ->getForm();
-
- $form->add('submit', 'submit', array('label' => 'Merge'));
- return $form;
- }
-
- protected function initListingView() {
-
- $branchName = $this->gitCommands->command('branch')->getCurrentBranch();
- //Local Server choice
- $gitLocalBranches = $this->gitCommands->command('branch')->getBranches(true);
-
- $gitLogCommand = $this->gitCommands->command('log');
-
-
- $gitLogCommand->setBranch($branchName)->setLogCount(1);
-
-
- $gitLogs = $gitLogCommand->execute()->getFirstResult();
-
- //$gitLogs = $this->gitCommands->getLog(1,$branchName);
-
- $this->viewVariables = array_merge($this->viewVariables, array(
- 'branches' => $gitLocalBranches,
- 'gitLogs' => array($gitLogs)
- ));
- }
-
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\HttpFoundation\Request;
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+
+/**
+ * Project controller.
+ *
+ * @Route("/project/{id}/branch")
+ */
+class ProjectBranchController extends BaseProjectController
+{
+ /**
+ * List Branches. Not sure how to list remote and local branches.
+ *
+ * @Route("es/{newBranchName}", name="project_branches")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function branchesAction($id, $newBranchName = false)
+ {
+ $this->initListingView();
+
+ $defaultData = array();
+ if ($newBranchName !== false) {
+ $defaultData['name'] = $newBranchName;
+ }
+
+ $form = $this->createNewBranchForm($this->project, $defaultData);
+
+ return array_merge($this->viewVariables, array(
+ 'form' => $form->createView(),
+ 'newBranchName' => $newBranchName,
+ ));
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("/create/", name="project_branch")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectBranch:branches.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function createBranchAction(Request $request, $id)
+ {
+ $form = $this->createNewBranchForm($this->project);
+ $form->handleRequest($request);
+
+ if ($form->isValid()) {
+ $data = $form->getData();
+ $newBranchName = $data['name'];
+ $switchToBranch = $data['switch'];
+ try {
+ $response = $this->gitCommands->command('branch')->createLocalBranch($newBranchName, $switchToBranch);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+
+ return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+ }
+
+ $this->initListingView();
+
+ return array_merge($this->viewVariables, array(
+ 'form' => $form->createView(),
+ 'newBranchName' => false,
+ ));
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("/checkoutbranch/{branchName}", name="project_checkoutbranch" , requirements={"branchName"=".+"})
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:Project:branches.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function checkoutBranchAction($id, $branchName)
+ {
+ try {
+ $response = $this->gitCommands->command('branch')->checkoutBranch($branchName);
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
+ }
+
+ /**
+ * List Branches. Not sure how to list remote and local branches.
+ *
+ * @Route("/remotes", name="project_branch_remotes")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function remoteBranchesAction($id)
+ {
+ $branchName = $this->gitCommands->command('branch')->getCurrentBranch();
+
+ //Remote Server choice
+ $gitRemoteBranches = $this->gitCommands->command('branch')->getBranchRemoteListing();
+
+ $form = $this->createNewBranchForm($this->project, array(), 'project_branch_remote_checkout');
+ $form->add('remotename', HiddenType::class, array(
+ 'label' => 'Remote Branch Name', 'required' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ );
+
+ return array_merge($this->viewVariables, array(
+ 'branches' => $gitRemoteBranches,
+ 'branchName' => $branchName,
+ 'form' => $form->createView(),
+ ));
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("/checkout-remote", name="project_branch_remote_checkout")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectBranch:remoteBranches.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function checkoutRemoteBranchAction(Request $request, $id)
+ {
+ $branchName = $this->gitCommands->command('branch')->getCurrentBranch();
+ $gitRemoteBranches = $this->gitCommands->command('branch')->getBranchRemoteListing();
+
+ $form = $this->createNewBranchForm($this->project, array(), 'project_branch_remote_checkout');
+ $form->add('remotename', HiddenType::class, array(
+ 'label' => 'Remote Branch Name', 'required' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ );
+
+ $form->handleRequest($request);
+
+ if ($form->isValid()) {
+ $data = $form->getData();
+ $newBranchName = $data['name'];
+ $remoteBranchName = $data['remotename'];
+ $switchToBranch = $data['switch'];
+
+ try {
+ $response = $this->gitCommands->command('branch')->createBranchFromRemote($newBranchName, $remoteBranchName, $switchToBranch);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+
+ return $this->redirect($this->generateUrl('project_branch_remotes', array('id' => $id)));
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'branches' => $gitRemoteBranches,
+ 'branchName' => $branchName,
+ 'form' => $form->createView(),
+ ));
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("/fetchall/", name="project_branch_fetchall")
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:ProjectBranch:remoteBranches.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function fetchAllAction($id)
+ {
+ try {
+ $response = $this->gitCommands->command('branch')->fetchAll();
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_branch_remotes', array('id' => $id)));
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("/deletebranch/{branchName}", name="project_deletebranch" , requirements={"branchName"=".+"})
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:Project:branches.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function deleteBranchAction($id, $branchName)
+ {
+ try {
+ $response = $this->gitCommands->command('branch')->deleteBranch($branchName);
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_branches', array('id' => $id)));
+ }
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createNewBranchForm($project, $defaultData = array(), $formAction = 'project_branch')
+ {
+
+ //$defaultData = array();
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
+ 'method' => 'POST',
+ ))
+ ->add('name', TextType::class, array(
+ 'label' => 'Branch Name', 'required' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('switch', CheckboxType::class, array(
+ 'label' => 'Switch to branch on creation', 'required' => false,
+ )
+ )
+ ->getForm();
+
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+ return $form;
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("/mergebranch/{branchName}", name="project_mergebranch" , requirements={"branchName"=".+"})
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:Project:branches.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function mergeBranchAction($id, $branchName)
+ {
+ try {
+ $user = $this->get('security.token_storage')->getToken()->getUser();
+ $author = $user->getName().' <'.$user->getEmail().'>';
+ $response = $this->gitCommands->command('branch')->mergeBranch($branchName);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_branches'));
+ }
+
+ private function getBranchesToMerge()
+ {
+ $gitLocalBranches = $this->gitCommands->command('branch')->getBranches(true);
+ $currentbranchName = $this->gitCommands->command('branch')->getCurrentBranch();
+ $mergeBranches = array();
+ foreach ($gitLocalBranches as $branchName) {
+ if ($branchName !== $currentbranchName) {
+ $mergeBranches[$branchName] = $branchName;
+ }
+ }
+
+ return $mergeBranches;
+ }
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createMergeBranchForm($project, $branches, $formAction = 'project_mergebranch')
+ {
+ $defaultData = array();
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
+ 'method' => 'POST',
+ ))
+ ->add('branch', ChoiceType::class, array(
+ 'choices' => $branches, 'label' => 'Branch Name', 'required' => true, 'choices_as_values' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->getForm();
+
+ $form->add('submit', SubmitType::class, array('label' => 'Merge'));
+
+ return $form;
+ }
+
+ protected function initListingView()
+ {
+ $branchName = $this->gitCommands->command('branch')->getCurrentBranch();
+ //Local Server choice
+ $gitLocalBranches = $this->gitCommands->command('branch')->getBranches(true);
+
+ $gitLogCommand = $this->gitCommands->command('log');
+
+ $gitLogCommand->setBranch($branchName)->setLogCount(1);
+
+ $gitLogs = $gitLogCommand->execute()->getFirstResult();
+
+ //$gitLogs = $this->gitCommands->getLog(1,$branchName);
+
+ $this->viewVariables = array_merge($this->viewVariables, array(
+ 'branches' => $gitLocalBranches,
+ 'gitLogs' => array($gitLogs),
+ ));
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php
similarity index 51%
rename from src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php
index 0a304ff..2cd4f52 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php
@@ -1,361 +1,458 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller;
-
-use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\HttpFoundation\Request;
-use VersionControl\GitControlBundle\Form\CommitType;
-use VersionControl\GitControlBundle\Entity\Commit;
-
-use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
-
- /** ///Route("/example", service="example_bundle.controller.example_controller") */
-
-/**
- * Project Commit controller.
- *
- * @Route("/project/{id}/commit")
- */
-class ProjectCommitController extends BaseProjectController
-{
-
- /**
- *
- * @var GitCommand
- */
- protected $gitCommitCommand;
-
- /**
- *
- * @var GitCommand
- */
- protected $gitSyncCommands;
-
- /**
- * The current Project
- * @var Project
- */
- protected $project;
-
- /**
- * Number of issues for this project
- * @var integer
- */
- protected $issuesCount;
-
- /**
- * Issue Respository
- * @var VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryInterface
- */
- protected $issueRepository;
-
- /**
- * List files to be commited.
- *
- * @Route("/", name="project_commitlist")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="EDIT")
- */
- public function listAction($id)
- {
-
- $files = $this->gitCommitCommand->getFilesToCommit();
-
- $commitEntity = new Commit();
- $commitEntity->setProject($this->project);
- $commitEntity->setStatusHash($this->gitCommitCommand->getStatusHash());
-
- $issueNumber = $this->issueNumberfromBranch($this->branchName);
- if($issueNumber !== false){
- $commitEntity->setIssue($issueNumber);
- }
-
- $commitForm = $this->createCommitForm($commitEntity,$files);
-
-
- return array_merge($this->viewVariables, array(
- 'files' => $files,
- 'commit_form' => $commitForm->createView(),
- 'issueCount' => $this->issuesCount
- ));
- }
-
-
- /**
- * Handles the commit form
- *
- * @Route("/", name="project_commit")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectCommit:list.html.twig")
- * @ProjectAccess(grantType="EDIT")
- */
- public function commitAction(Request $request)
- {
-
- $files = $this->gitCommitCommand->getFilesToCommit();
-
- $commitEntity = new Commit();
- $commitEntity->setProject($this->project);
- $commitForm = $this->createCommitForm($commitEntity,$files);
- $commitForm->handleRequest($request);
-
- if ($commitForm->isValid()) {
-
- $selectedGitFiles = $commitEntity->getFiles();
-
- try{
- $selectedFiles = array();
- $filesCommited = 0;
-
- if(is_array($selectedGitFiles)){
- foreach($selectedGitFiles as $gitFile){
- $selectedFiles[] = $gitFile->getPath1();
- }
-
- $filesCommited = count($selectedFiles);
- //Git Stage selected files
- $this->gitCommitCommand->stageFiles($selectedFiles);
- }else{
- //To many files
- if($selectedGitFiles === true){
- $this->gitCommitCommand->stageAll();
-
- $filesCommited = count($files);
- }
- }
-
- //Handle Issue Action eg Close issue. Update Commit message
- $this->handleIssue($commitEntity);
-
- $user = $this->get('security.token_storage')->getToken()->getUser();
- $author = $user->getName().' <'.$user->getEmail().'>';
- //Git Commit
- $this->gitCommitCommand->commit($commitEntity->getComment(),$author);
-
- //Set notice of successfull commit
- $this->get('session')->getFlashBag()->add('notice'
- , $filesCommited." files have been committed");
-
- $this->get('session')->getFlashBag()->add('status-refresh','true');
-
- //Git Push to remote repository
- $this->pushToRemote($commitEntity);
-
- return $this->redirect($this->generateUrl('project_commitlist'));
-
- }catch(\Exception $e){
- $this->get('session')->getFlashBag()->add('error'
- , $e->getMessage());
- }
-
- }
-
-
-
- return array_merge($this->viewVariables, array(
- 'files' => $files,
- 'commit_form' => $commitForm->createView(),
- 'issueCount' => $this->issuesCount
- ));
-
- }
-
- /**
- *
- * @param integer $id
- */
- public function initAction($id, $grantType = 'EDIT'){
-
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
- return $redirectUrl;
- }
- $this->gitCommitCommand = $this->gitCommands->command('commit');
- $this->gitSyncCommands = $this->gitCommands->command('sync');
-
- $em = $this->getDoctrine()->getManager();
-
- $issueIntegrator= $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
- $this->issueManager = $this->get('version_control.issue_repository_manager');
- if($issueIntegrator){
- $this->issueManager->setIssueIntegrator($issueIntegrator);
- }else{
- $this->issueManager->setProject($this->project);
- }
- $this->issueRepository = $this->issueManager->getIssueRepository();
- $this->issuesCount = $this->issueRepository->countFindIssues('','open');
-
-
-
-
- }
-
-
- private function createCommitForm($commitEntity,$fileChoices){
-
- $includeIssues = ($this->issuesCount > 0)?true:false;
- //$fileChoices = $this->gitCommitCommand->getFilesToCommit();
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
-
- //$form = $this->createForm((new CommitType($includeIssues,$gitRemoteVersions))->setFileChoices($fileChoices), $commitEntity, array(
- // 'action' => $this->generateUrl('project_commit'),
- // 'method' => 'POST',
- //));
-
- $form = $this->createForm(CommitType::class, $commitEntity, array(
- 'action' => $this->generateUrl('project_commit'),
- 'method' => 'POST',
- 'includeIssues' => $includeIssues,
- 'gitRemoteVersions' => $gitRemoteVersions,
- 'fileChoices' => $fileChoices,
- ));
-
- $form->add('submit', SubmitType::class, array('label' => 'Commit'));
-
- return $form;
-
- }
-
- /**
- * Aborts a merge action. Should only be called after a merge.
- *
- * @Route("/about-merge/", name="project_commit_abortmerge")
- * @Method("GET")
- * @ProjectAccess(grantType="EDIT")
- */
- public function abortMergeAction($id){
-
- //$this->gitCommitCommand = $this->get('version_control.git_command')->setProject($this->project);
-
- return $this->redirect($this->generateUrl('project_commitlist'));
-
- }
-
- /**
- * Check if issue options have been set and updates git message
- * and closes issue if certain issue actions are set.
- *
- * @param Commit $commitEntity]
- */
- protected function handleIssue(\VersionControl\GitControlBundle\Entity\Commit &$commitEntity){
- $issueId = $commitEntity->getIssue();
- $commitMessage = $commitEntity->getComment();
- $issueCloseStatus = array('Fixed','Closed','Resolved');
-
- if($issueId){
- $issueEntity = $this->issueRepository->findIssueById($issueId);
- if($issueEntity){
- $issueAction = $commitEntity->getIssueAction();
- $commitMessage = $issueAction.' #'.$issueEntity->getId().':'.$commitMessage;
- $commitEntity->setComment($commitMessage);
- if(in_array($issueAction,$issueCloseStatus)){
- //Close Issue
- $this->issueRepository->closeIssue($issueEntity->getId());
- }
- }
- }
- }
-
-
- /**
- * Push to remote repositories. Supports mulitple pushes
- *
- * @param Commit $commitEntity
- */
- protected function pushToRemote(\VersionControl\GitControlBundle\Entity\Commit $commitEntity){
- $branch = $this->gitCommands->command('branch')->getCurrentBranch();
-
- $gitRemotes = $commitEntity->getPushRemote();
- if(count($gitRemotes) > 0){
-
- foreach($gitRemotes as $gitRemote){
- try{
- $response = $this->gitSyncCommands->push($gitRemote,$branch);
- $this->get('session')->getFlashBag()->add('notice', $response);
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- }
- }
- }
-
- /**
- * Show Git commit diff
- *
- * @Route("/filediff/{difffile}", name="project_filediff")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="EDIT")
- */
- public function fileDiffAction($id,$difffile){
-
- $gitDiffCommand = $this->gitCommands->command('diff');
-
- $difffile = urldecode($difffile);
-
- $gitDiffs = $gitDiffCommand->getDiffFile($difffile);
-
- return array_merge($this->viewVariables, array(
- 'diffs' => $gitDiffs,
- ));
- }
-
- /**
- * Reset a File bakc to head
- *
- * @Route("/reset-file/{filePath}", name="project_reset_file")
- * @Method("GET")
- * @ProjectAccess(grantType="EDIT")
- */
- public function resetFileAction($filePath){
-
- try{
- $gitUndoCommand = $this->gitCommands->command('undo');
- $file = urldecode($filePath);
- $response = $gitUndoCommand->checkoutFile($file,'HEAD');
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('status-refresh','true');
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_commitlist'));
-
- }
-
- protected function issueNumberfromBranch($branch){
- $issueNumber = false;
- $matches = array();
- if (preg_match('/(issue|iss|issu)(\d+)/i', $branch, $matches)) {
- foreach($matches as $issueId){
- if(is_numeric($issueId)){
- $issueNumber = $issueId;
- }
- }
- }
-
- return $issueNumber;
- }
-
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\HttpFoundation\Request;
+use VersionControl\GitControlBundle\Form\CommitType;
+use VersionControl\GitControlBundle\Entity\Commit;
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
+/** ///Route("/example", service="example_bundle.controller.example_controller") */
+
+/**
+ * Project Commit controller.
+ *
+ * @Route("/project/{id}/commit")
+ */
+class ProjectCommitController extends BaseProjectController
+{
+ /**
+ * @var GitCommand
+ */
+ protected $gitCommitCommand;
+
+ /**
+ * @var GitCommand
+ */
+ protected $gitSyncCommands;
+
+ /**
+ * The current Project.
+ *
+ * @var Project
+ */
+ protected $project;
+
+ /**
+ * Number of issues for this project.
+ *
+ * @var int
+ */
+ protected $issuesCount;
+
+ /**
+ * Issue Respository.
+ *
+ * @var VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryInterface
+ */
+ protected $issueRepository;
+
+ /**
+ * List files to be commited.
+ *
+ * @Route("/", name="project_commitlist")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function listAction($id)
+ {
+ $files = $this->gitCommitCommand->getFilesToCommit();
+
+ //Get merge conflicts
+ $conflictFileNames = $this->gitCommands->command('diff')->getConflictFileNames();
+
+ $files = $this->filterConflicts($files,$conflictFileNames);
+
+ $commitEntity = new Commit();
+ $commitEntity->setProject($this->project);
+ $commitEntity->setStatusHash($this->gitCommitCommand->getStatusHash());
+
+ $issueNumber = $this->issueNumberfromBranch($this->branchName);
+ if ($issueNumber !== false) {
+ $commitEntity->setIssue($issueNumber);
+ }
+
+ $commitForm = $this->createCommitForm($commitEntity, $files);
+
+ return array_merge($this->viewVariables, array(
+ 'files' => $files,
+ 'conflictFileNames' => $conflictFileNames,
+ 'commit_form' => $commitForm->createView(),
+ 'issueCount' => $this->issuesCount,
+ ));
+ }
+
+ /**
+ * Handles the commit form.
+ *
+ * @Route("/", name="project_commit")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectCommit:list.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function commitAction(Request $request)
+ {
+ $files = $this->gitCommitCommand->getFilesToCommit();
+
+ //Get merge conflicts
+ $conflictFileNames = $this->gitCommands->command('diff')->getConflictFileNames();
+ $files = $this->filterConflicts($files,$conflictFileNames);
+
+ $commitEntity = new Commit();
+ $commitEntity->setProject($this->project);
+ $commitForm = $this->createCommitForm($commitEntity, $files);
+ $commitForm->handleRequest($request);
+
+ if ($commitForm->isValid()) {
+ $selectedGitFiles = $commitEntity->getFiles();
+
+ try {
+ $selectedFiles = array();
+ $filesCommited = 0;
+
+ if (is_array($selectedGitFiles)) {
+ foreach ($selectedGitFiles as $gitFile) {
+ $selectedFiles[] = $gitFile->getPath1();
+ }
+
+ $filesCommited = count($selectedFiles);
+ //Git Stage selected files
+ $this->gitCommitCommand->stageFiles($selectedFiles);
+ } else {
+ //To many files
+ if ($selectedGitFiles === true) {
+ $this->gitCommitCommand->stageAll();
+
+ $filesCommited = count($files);
+ }
+ }
+
+ //Handle Issue Action eg Close issue. Update Commit message
+ $this->handleIssue($commitEntity);
+
+ $user = $this->get('security.token_storage')->getToken()->getUser();
+ $author = $user->getName().' <'.$user->getEmail().'>';
+ //Git Commit
+ $this->gitCommitCommand->commit($commitEntity->getComment(), $author);
+
+ //Set notice of successfull commit
+ $this->get('session')->getFlashBag()->add('notice', $filesCommited.' files have been committed');
+
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+
+ //Git Push to remote repository
+ $this->pushToRemote($commitEntity);
+
+ return $this->redirect($this->generateUrl('project_commitlist'));
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'files' => $files,
+ 'conflictFileNames' => $conflictFileNames,
+ 'commit_form' => $commitForm->createView(),
+ 'issueCount' => $this->issuesCount,
+ ));
+ }
+
+ /**
+ * @param int $id
+ */
+ public function initAction($id, $grantType = 'EDIT')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
+ return $redirectUrl;
+ }
+ $this->gitCommitCommand = $this->gitCommands->command('commit');
+ $this->gitSyncCommands = $this->gitCommands->command('sync');
+
+ $em = $this->getDoctrine()->getManager();
+
+ $issueIntegrator = $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
+ $this->issueManager = $this->get('version_control.issue_repository_manager');
+ if ($issueIntegrator) {
+ $this->issueManager->setIssueIntegrator($issueIntegrator);
+ } else {
+ $this->issueManager->setProject($this->project);
+ }
+ $this->issueRepository = $this->issueManager->getIssueRepository();
+ $this->issuesCount = $this->issueRepository->countFindIssues('', 'open');
+ }
+
+ private function createCommitForm($commitEntity, $fileChoices)
+ {
+ $includeIssues = ($this->issuesCount > 0) ? true : false;
+ //$fileChoices = $this->gitCommitCommand->getFilesToCommit();
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+
+ $form = $this->createForm(CommitType::class, $commitEntity, array(
+ 'action' => $this->generateUrl('project_commit'),
+ 'method' => 'POST',
+ 'includeIssues' => $includeIssues,
+ 'gitRemoteVersions' => $gitRemoteVersions,
+ 'fileChoices' => $fileChoices,
+ ));
+
+ $form->add('submit', SubmitType::class, array('label' => 'Commit'));
+
+ return $form;
+ }
+
+ /**
+ * Aborts a merge action. Should only be called after a merge.
+ *
+ * @Route("/about-merge/", name="project_commit_abortmerge")
+ * @Method("GET")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function abortMergeAction($id)
+ {
+
+ //$this->gitCommitCommand = $this->get('version_control.git_command')->setProject($this->project);
+
+ return $this->redirect($this->generateUrl('project_commitlist'));
+ }
+
+ /**
+ * Check if issue options have been set and updates git message
+ * and closes issue if certain issue actions are set.
+ *
+ * @param Commit $commitEntity]
+ */
+ protected function handleIssue(\VersionControl\GitControlBundle\Entity\Commit &$commitEntity)
+ {
+ $issueId = $commitEntity->getIssue();
+ $commitMessage = $commitEntity->getComment();
+ $issueCloseStatus = array('Fixed', 'Closed', 'Resolved');
+
+ if ($issueId) {
+ $issueEntity = $this->issueRepository->findIssueById($issueId);
+ if ($issueEntity) {
+ $issueAction = $commitEntity->getIssueAction();
+ $commitMessage = $issueAction.' #'.$issueEntity->getId().':'.$commitMessage;
+ $commitEntity->setComment($commitMessage);
+ if (in_array($issueAction, $issueCloseStatus)) {
+ //Close Issue
+ $this->issueRepository->closeIssue($issueEntity->getId());
+ }
+ }
+ }
+ }
+
+ /**
+ * Push to remote repositories. Supports mulitple pushes.
+ *
+ * @param Commit $commitEntity
+ */
+ protected function pushToRemote(\VersionControl\GitControlBundle\Entity\Commit $commitEntity)
+ {
+ $branch = $this->gitCommands->command('branch')->getCurrentBranch();
+
+ $gitRemotes = $commitEntity->getPushRemote();
+ if (count($gitRemotes) > 0) {
+ foreach ($gitRemotes as $gitRemote) {
+ try {
+ $response = $this->gitSyncCommands->push($gitRemote, $branch);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+ }
+ }
+ }
+
+ /**
+ * Show Git commit diff.
+ *
+ * @Route("/filediff/{difffile}", name="project_filediff")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function fileDiffAction($id, $difffile)
+ {
+ $gitDiffCommand = $this->gitCommands->command('diff');
+
+ $difffile = urldecode($difffile);
+
+ $gitDiffs = $gitDiffCommand->getDiffFile($difffile);
+
+ return array_merge($this->viewVariables, array(
+ 'diffs' => $gitDiffs,
+ ));
+ }
+
+ /**
+ * Filter conflicted files. Following is list of conflicted states
+ * -------------------------------------------------
+ * D D unmerged, both deleted
+ * A U unmerged, added by us
+ * U D unmerged, deleted by them
+ * U A unmerged, added by them
+ * D U unmerged, deleted by us
+ * A A unmerged, both added
+ * U U unmerged, both modified
+ * -------------------------------------------------
+ *
+ * @param array $files
+ * @param array $conflictedFiles
+ * @return type
+ */
+ public function filterConflicts($files,$conflictedFiles){
+
+ //Get merge conflicts
+ $conflictFileNames = $this->gitCommands->command('diff')->getConflictFileNames();
+ if(count($conflictFileNames) > 0){
+ $conflictedFiles = array();
+ foreach($files as $file){
+ if(($file->getIndexStatus() == 'U' || $file->getWorkTreeStatus() == 'U')
+ || ($file->getIndexStatus() == 'D' && $file->getWorkTreeStatus() == 'D')
+ || ($file->getIndexStatus() == 'A' && $file->getWorkTreeStatus() == 'A')
+ ){
+ $conflictedFiles[] = $file;
+ }
+ }
+ $files = $conflictedFiles;
+ }
+
+ return $files;
+ }
+
+ /**
+ * Reset a File back to head.
+ *
+ * @Route("/reset-file/{filePath}", name="project_reset_file")
+ * @Method("GET")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function resetFileAction($filePath)
+ {
+ try {
+ $gitUndoCommand = $this->gitCommands->command('undo');
+ $file = urldecode($filePath);
+ $response = $gitUndoCommand->checkoutFile($file, 'HEAD', false);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_commitlist'));
+ }
+
+ protected function issueNumberfromBranch($branch)
+ {
+ $issueNumber = false;
+ $matches = array();
+ if (preg_match('/(issue|iss|issu)(\d+)/i', $branch, $matches)) {
+ foreach ($matches as $issueId) {
+ if (is_numeric($issueId)) {
+ $issueNumber = $issueId;
+ }
+ }
+ }
+
+ return $issueNumber;
+ }
+
+ /**
+ * Fix git conflict files
+ *
+ * @Route("/fix-conflict/{filePath}", name="project_fix_conflict")
+ * @Method("GET")
+ * @ProjectAccess(grantType="EDIT")
+ * @Template()
+ */
+ public function fixConflictAction($filePath)
+ {
+ $file = urldecode($filePath);
+
+ return array_merge($this->viewVariables, array(
+ 'filePath' => $filePath,
+ ));
+ }
+
+ /**
+ * Reset a File back to head.
+ *
+ * @Route("/fixed-conflict/{filePath}/{option}", name="project_fixed_conflict")
+ * @Method("GET")
+ * @ProjectAccess(grantType="EDIT")
+ * @Template()
+ */
+ public function fixedConflictAction($filePath,$option)
+ {
+ $file = urldecode($filePath);
+ try {
+ $gitUndoCommand = $this->gitCommands->command('undo');
+ if($option === 'theirs'){
+ $response = $gitUndoCommand->checkoutTheirFile($file);
+ }elseif($option === 'ours'){
+ $response = $gitUndoCommand->checkoutOurFile($file);
+ }elseif($option === 'delete'){
+ $response = $gitUndoCommand->deleteFile($file);
+ }else{
+ $response = $gitUndoCommand->addFile($file);
+ }
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_commitlist'));
+ }
+
+ /**
+ * Fix deleted conflict e.g. (D U)
+ *
+ * @Route("/fix-delete-conflict/{filePath}", name="project_fix_delete_conflict")
+ * @Method("GET")
+ * @ProjectAccess(grantType="EDIT")
+ * @Template()
+ */
+ public function fixDeleteConflictAction($filePath)
+ {
+ $file = urldecode($filePath);
+
+ return array_merge($this->viewVariables, array(
+ 'filePath' => $filePath,
+ ));
+ }
+
+ /**
+ * Fix file that has been added in both branches e.g. (A A)
+ *
+ * @Route("/fix-add-conflict/{filePath}", name="project_fix_add_conflict")
+ * @Method("GET")
+ * @ProjectAccess(grantType="EDIT")
+ * @Template()
+ */
+ public function fixAddConflictAction($filePath)
+ {
+ $file = urldecode($filePath);
+
+ return array_merge($this->viewVariables, array(
+ 'filePath' => $filePath,
+ ));
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectController.php
similarity index 81%
rename from src/VersionControl/GitControlBundle/Controller/ProjectController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectController.php
index de74d63..61a4ea4 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectController.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
@@ -16,10 +17,8 @@
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Project;
use VersionControl\GitControlBundle\Form\ProjectType;
-use VersionControl\GitControlBundle\Utility\GitCommands;
-use Symfony\Component\Validator\Constraints\NotBlank;
use VersionControl\GitControlBundle\Entity\UserProjects;
-
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
/**
@@ -29,7 +28,6 @@
*/
class ProjectController extends Controller
{
-
/**
* Creates a new Project entity.
*
@@ -45,19 +43,19 @@ public function createAction(Request $request)
if ($form->isValid()) {
$em = $this->getDoctrine()->getManager();
-
+
//Get User
$user = $this->get('security.token_storage')->getToken()->getUser();
-
+
//Set Creator
$project->setCreator($user);
-
+
//Set Access and Roles
$userProjectAccess = new UserProjects();
$userProjectAccess->setUser($user);
$userProjectAccess->setRoles('Owner');
$project->addUserProjects($userProjectAccess);
-
+
$em->persist($project);
$em->flush();
@@ -66,11 +64,10 @@ public function createAction(Request $request)
return array(
'entity' => $project,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
);
}
-
/**
* Creates a form to create a Project entity.
*
@@ -80,12 +77,12 @@ public function createAction(Request $request)
*/
private function createCreateForm(Project $entity)
{
- $form = $this->createForm(new ProjectType(), $entity, array(
+ $form = $this->createForm(ProjectType::class, $entity, array(
'action' => $this->generateUrl('project_create'),
'method' => 'POST',
));
- $form->add('submit', 'submit', array('label' => 'Create'));
+ $form->add('submit', SubmitType::class, array('label' => 'Create', 'validation_groups' => 'New'));
return $form;
}
@@ -100,16 +97,14 @@ private function createCreateForm(Project $entity)
public function newAction()
{
$entity = new Project();
- $form = $this->createCreateForm($entity);
+ $form = $this->createCreateForm($entity);
return array(
'entity' => $entity,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
);
}
-
-
/**
* Displays a form to edit an existing Project entity.
*
@@ -126,34 +121,34 @@ public function editAction($id)
if (!$project) {
throw $this->createNotFoundException('Unable to find Project entity.');
}
-
- $this->checkProjectAuthorization($project,'MASTER');
+
+ $this->checkProjectAuthorization($project, 'MASTER');
$editForm = $this->createEditForm($project);
$deleteForm = $this->createDeleteForm($id);
-
+
return array(
- 'project' => $project,
- 'edit_form' => $editForm->createView(),
+ 'project' => $project,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
);
}
/**
- * Creates a form to edit a Project entity.
- *
- * @param Project $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm(Project $entity)
{
- $form = $this->createForm(new ProjectType(), $entity, array(
+ $form = $this->createForm(ProjectType::class, $entity, array(
'action' => $this->generateUrl('project_update', array('id' => $entity->getId())),
'method' => 'PUT',
));
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update', 'validation_groups' => 'Edit'));
return $form;
}
@@ -173,8 +168,8 @@ public function updateAction(Request $request, $id)
if (!$project) {
throw $this->createNotFoundException('Unable to find Project entity.');
}
-
- $this->checkProjectAuthorization($project,'MASTER');
+
+ $this->checkProjectAuthorization($project, 'MASTER');
$deleteForm = $this->createDeleteForm($id);
$editForm = $this->createEditForm($project);
@@ -182,15 +177,15 @@ public function updateAction(Request $request, $id)
if ($editForm->isValid()) {
$em->flush();
-
- $this->get('session')->getFlashBag()->add('notice',"Project record updated");
+
+ $this->get('session')->getFlashBag()->add('notice', 'Project record updated');
return $this->redirect($this->generateUrl('project_edit', array('id' => $id)));
}
return array(
- 'project' => $project,
- 'edit_form' => $editForm->createView(),
+ 'project' => $project,
+ 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
);
}
@@ -208,13 +203,12 @@ public function deleteAction(Request $request, $id)
if (!$project) {
throw $this->createNotFoundException('Unable to find Project entity.');
}
-
- $this->checkProjectAuthorization($project,'MASTER');
-
+
+ $this->checkProjectAuthorization($project, 'MASTER');
+
$form = $this->createDeleteForm($id);
$form->handleRequest($request);
-
-
+
if ($form->isValid()) {
$em->remove($project);
$em->flush();
@@ -235,18 +229,18 @@ private function createDeleteForm($id)
return $this->createFormBuilder()
->setAction($this->generateUrl('project_delete', array('id' => $id)))
->setMethod('DELETE')
- ->add('submit', 'submit', array('label' => 'Delete'))
+ ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
-
-
+
/**
- *
* @param VersionControl\GitControlBundle\Entity\Project $project
+ *
* @throws AccessDeniedException
*/
- protected function checkProjectAuthorization(\VersionControl\GitControlBundle\Entity\Project $project,$grantType='MASTER'){
+ protected function checkProjectAuthorization(\VersionControl\GitControlBundle\Entity\Project $project, $grantType = 'MASTER')
+ {
$authorizationChecker = $this->get('security.authorization_checker');
// check for edit access
@@ -254,5 +248,4 @@ protected function checkProjectAuthorization(\VersionControl\GitControlBundle\En
throw new AccessDeniedException();
}
}
-
}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectEnvironmentController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectEnvironmentController.php
similarity index 74%
rename from src/VersionControl/GitControlBundle/Controller/ProjectEnvironmentController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectEnvironmentController.php
index 7c10832..de091bf 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectEnvironmentController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectEnvironmentController.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
@@ -16,15 +17,10 @@
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Project;
use VersionControl\GitControlBundle\Entity\ProjectEnvironment;
-
use VersionControl\GitControlBundle\Form\ProjectEnvironmentType;
-
-use VersionControl\GitControlBundle\Entity\UserProjects;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
/**
* Project controller.
*
@@ -32,36 +28,6 @@
*/
class ProjectEnvironmentController extends BaseProjectController
{
-
- /**
- * Lists all Project entities.
- *
- * @Route("s/", name="projectenvironment")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="OWNER")
- */
- public function indexAction(Request $request)
- {
-
- $em = $this->getDoctrine()->getManager();
-
- $keyword = $request->query->get('keyword', false);
-
- $query = $em->getRepository('VersionControlGitControlBundle:ProjectEnvironment')->findByProjectAndKeyword($keyword,true)->getQuery();
- $paginator = $this->get('knp_paginator');
- $pagination = $paginator->paginate(
- $query,
- $request->query->getInt('page', 1)/*page number*/,
- 15/*limit per page*/
- );
-
- return array(
- 'pagination' => $pagination,
- );
- }
-
-
/**
* Creates a new Project entity.
*
@@ -70,32 +36,30 @@ public function indexAction(Request $request)
* @Template("VersionControlGitControlBundle:ProjectEnvironment:new.html.twig")
* @ProjectAccess(grantType="OWNER")
*/
- public function createAction(Request $request,$gitAction = '')
+ public function createAction(Request $request, $gitAction = '')
{
-
$projectEnvironment = new ProjectEnvironment();
- $form = $this->createCreateForm($projectEnvironment,$this->project,$gitAction);
+ $form = $this->createCreateForm($projectEnvironment, $this->project, $gitAction);
//$form = $this->createCreateForm($projectEnvironment,$project,'clone');
$form->handleRequest($request);
if ($form->isValid()) {
-
- $gitAction = $form->get('gitaction')->getData();
-
+ $gitAction = $form->get('gitaction')->getData();
+
$em = $this->getDoctrine()->getManager();
-
+
//Set Project
$projectEnvironment->setProject($this->project);
-
- if($gitAction === 'new'){
+
+ if ($gitAction === 'new') {
//Create git repo
$this->createEmptyGitRepository($projectEnvironment);
- }else if($gitAction === 'clone'){
+ } elseif ($gitAction === 'clone') {
//Create Git Clone
-
+
$this->cloneGitRepository($projectEnvironment);
}
-
+
$em->persist($projectEnvironment);
$em->flush();
@@ -104,11 +68,10 @@ public function createAction(Request $request,$gitAction = '')
return array_merge($this->viewVariables, array(
'projectEnvironment' => $projectEnvironment,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
-
/**
* Creates a form to create a Project entity.
*
@@ -116,26 +79,26 @@ public function createAction(Request $request,$gitAction = '')
*
* @return \Symfony\Component\Form\Form The form
*/
- private function createCreateForm(ProjectEnvironment $entity,$project,$gitaction = '')
+ private function createCreateForm(ProjectEnvironment $entity, $project, $gitaction = '')
{
- if($gitaction == 'clone'){
+ if ($gitaction == 'clone') {
$projectEnvironmentType = new ProjectEnvironmentType(true);
- }else{
+ } else {
$projectEnvironmentType = new ProjectEnvironmentType(false);
}
$form = $this->createForm($projectEnvironmentType, $entity, array(
- 'action' => $this->generateUrl('projectenvironment_create',array('gitAction'=>$gitaction)),
+ 'action' => $this->generateUrl('projectenvironment_create', array('gitAction' => $gitaction)),
'method' => 'POST',
));
-
+
$form->add('gitaction', 'hidden', array(
'mapped' => false,
'empty_data' => false,
'required' => 'required',
- 'data'=>$gitaction
+ 'data' => $gitaction,
));
- $form->add('submit', 'submit', array('label' => 'Create'));
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
return $form;
}
@@ -144,25 +107,21 @@ private function createCreateForm(ProjectEnvironment $entity,$project,$gitaction
* Displays a form to create a new Project entity.
*
* @Route("/new/", name="projectenvironment_new")
- * @ParamConverter("project", class="VersionControlGitControlBundle:Project")
* @Method("GET")
* @Template("VersionControlGitControlBundle:ProjectEnvironment:new.html.twig")
* @ProjectAccess(grantType="OWNER")
*/
public function newAction()
{
-
$projectEnvironment = new ProjectEnvironment();
- $form = $this->createCreateForm($projectEnvironment,$this->project,'new');
-
-
+ $form = $this->createCreateForm($projectEnvironment, $this->project, 'new');
return array_merge($this->viewVariables, array(
'projectEnvironment' => $projectEnvironment,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
-
+
/**
* Displays a form to create a new Project entity.
*
@@ -173,16 +132,15 @@ public function newAction()
*/
public function cloneAction()
{
-
$projectEnvironment = new ProjectEnvironment();
- $form = $this->createCreateForm($projectEnvironment,$this->project,'clone');
+ $form = $this->createCreateForm($projectEnvironment, $this->project, 'clone');
return array_merge($this->viewVariables, array(
'projectEnvironment' => $projectEnvironment,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
-
+
/**
* Displays a form to create a new Project entity.
*
@@ -193,18 +151,15 @@ public function cloneAction()
*/
public function existingAction()
{
-
$projectEnvironment = new ProjectEnvironment();
- $form = $this->createCreateForm($projectEnvironment,$this->project);
+ $form = $this->createCreateForm($projectEnvironment, $this->project);
return array_merge($this->viewVariables, array(
'projectEnvironment' => $projectEnvironment,
- 'form' => $form->createView(),
+ 'form' => $form->createView(),
));
}
-
-
/**
* Displays a form to edit an existing Project entity.
*
@@ -225,30 +180,29 @@ public function editAction($projectEnvironmentId)
$editForm = $this->createEditForm($projectEnvironment);
$deleteForm = $this->createDeleteForm($projectEnvironmentId);
-
-
+
return array_merge($this->viewVariables, array(
- 'projectEnvironment' => $projectEnvironment,
- 'form' => $editForm->createView(),
+ 'projectEnvironment' => $projectEnvironment,
+ 'form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
));
}
/**
- * Creates a form to edit a Project entity.
- *
- * @param Project $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm(ProjectEnvironment $entity)
{
- $form = $this->createForm(new ProjectEnvironmentType(), $entity, array(
+ $form = $this->createForm(ProjectEnvironmentType::class, $entity, array(
'action' => $this->generateUrl('projectenvironment_update', array('projectEnvironmentId' => $entity->getId())),
'method' => 'PUT',
));
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
return $form;
}
@@ -276,15 +230,15 @@ public function updateAction(Request $request, $projectEnvironmentId)
if ($editForm->isValid()) {
$em->flush();
-
- $this->get('session')->getFlashBag()->add('success',"Project Environment record updated");
+
+ $this->get('session')->getFlashBag()->add('success', 'Project Environment record updated');
return $this->redirect($this->generateUrl('projectenvironment_edit', array('projectEnvironmentId' => $projectEnvironmentId)));
}
return array_merge($this->viewVariables, array(
- 'projectEnvironment' => $projectEnvironment,
- 'form' => $editForm->createView(),
+ 'projectEnvironment' => $projectEnvironment,
+ 'form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
));
}
@@ -303,11 +257,10 @@ public function deleteAction(Request $request, $projectEnvironmentId)
if (!$projectEnvironment) {
throw $this->createNotFoundException('Unable to find Project Environment entity.');
}
-
+
$form = $this->createDeleteForm($projectEnvironmentId);
$form->handleRequest($request);
-
-
+
if ($form->isValid()) {
$em->remove($projectEnvironment);
$em->flush();
@@ -328,73 +281,70 @@ private function createDeleteForm($projectEnvironmentId)
return $this->createFormBuilder()
->setAction($this->generateUrl('projectenvironment_delete', array('projectEnvironmentId' => $projectEnvironmentId)))
->setMethod('DELETE')
- ->add('submit', 'submit', array('label' => 'Delete'))
+ ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
-
- protected function createEmptyGitRepository($projectEnvironment){
+
+ protected function createEmptyGitRepository($projectEnvironment)
+ {
$gitCommands = $this->gitCommands->command('init')->overRideGitEnvironment($projectEnvironment);
-
+
$response = $gitCommands->initRepository();
-
+
$this->get('session')->getFlashBag()->add('notice', $response);
}
-
- protected function cloneGitRepository($projectEnvironment){
+
+ protected function cloneGitRepository($projectEnvironment)
+ {
//$projectEnvironment->getGitCloneLocation();
$gitCommands = $this->gitCommands->command('init')->overRideGitEnvironment($projectEnvironment);
- try{
+ try {
$response = $gitCommands->cloneRepository($projectEnvironment->getGitCloneLocation());
$this->get('session')->getFlashBag()->add('notice', $response);
- }catch(\Exception $e){
+ } catch (\Exception $e) {
$this->get('session')->getFlashBag()->add('error', $e->getMessage());
}
-
-
-
}
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
- public function initAction($id,$grantType = 'VIEW'){
-
+ public function initAction($id, $grantType = 'VIEW')
+ {
$em = $this->getDoctrine()->getManager();
- $this->project= $em->getRepository('VersionControlGitControlBundle:Project')->find($id);
+ $this->project = $em->getRepository('VersionControlGitControlBundle:Project')->find($id);
if (!$this->project) {
throw $this->createNotFoundException('Unable to find Project entity.');
}
- $this->checkProjectAuthorization($this->project,$grantType);
-
+ $this->checkProjectAuthorization($this->project, $grantType);
+
$projectEnvironment = $this->getProjectEnvironment();
-
- if($projectEnvironment){
+
+ if ($projectEnvironment) {
$this->gitCommands = $this->get('version_control.git_commands')->setGitEnvironment($projectEnvironment);
- }else{
+ } else {
$this->gitCommands = $this->get('version_control.git_commands');
}
$this->gitCommands = $this->get('version_control.git_commands');
//$this->gitBranchCommands = $this->get('version_control.git_branch')->setProject($this->project);
-
+
//$this->branchName = $this->gitCommands->command('branch')->getCurrentBranch();
$this->viewVariables = array_merge($this->viewVariables, array(
- 'project' => $this->project,
+ 'project' => $this->project,
'branchName' => $this->branchName,
));
}
-
+
/**
- * Gets the project Environment for the Project Environment Storage
+ * Gets the project Environment for the Project Environment Storage.
*/
- public function getProjectEnvironment() {
+ public function getProjectEnvironment()
+ {
$projectEnvironmentStorage = $this->get('version_control.project_environmnent_storage');
+
return $projectEnvironmentStorage->getProjectEnviromment($this->project);
}
-
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php
similarity index 67%
rename from src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php
index 2300f68..2d1179e 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php
@@ -7,21 +7,15 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
-use Symfony\Component\HttpFoundation\Request;
use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
use VersionControl\GitControlBundle\Utility\GitCommands;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
/**
@@ -29,99 +23,100 @@
*
* @Route("/project/{id}/file")
*/
-class ProjectFilesController extends BaseProjectController{
-
+class ProjectFilesController extends BaseProjectController
+{
/**
- *
- * @var GitCommand
+ * @var GitCommand
*/
protected $gitFilesCommands;
-
-
+
/**
- * Show Git commit diff
+ * Show Git commit diff.
*
* @Route("s/{currentDir}",defaults={"$currentDir" = ""}, name="project_filelist")
* @Method("GET")
* @Template()
* @ProjectAccess(grantType="VIEW")
*/
- public function fileListAction($id,$currentDir = ''){
-
+ public function fileListAction($id, $currentDir = '')
+ {
$dir = '';
- if($currentDir){
+ if ($currentDir) {
$dir = trim(urldecode($currentDir));
}
$files = $this->gitFilesCommands->listFiles($dir, $this->branchName);
-
+
$readme = '';
- foreach($files as $file){
- if(strtolower($file->getExtension()) == 'md' || strtolower($file->getExtension()) == 'markdown'){
- $readme = $this->gitFilesCommands->readFile($file);
- break;
+ foreach ($files as $file) {
+ if (strtolower($file->getExtension()) == 'md' || strtolower($file->getExtension()) == 'markdown') {
+ if(strtolower($file->getFilename()) === 'readme' ){
+ $readme = $this->gitFilesCommands->readFile($file);
+ break;
+ }else{
+ //Get last md file
+ $readme = $this->gitFilesCommands->readFile($file);
+ }
}
}
-
+
return array_merge($this->viewVariables, array(
'files' => $files,
'currentDir' => $dir,
- 'readme' => $readme
+ 'readme' => $readme,
));
}
-
+
/**
- * Show Git commit diff
+ * Show Git commit diff.
*
* @Route("/{currentFile}",defaults={"$currentFile" = ""}, name="project_viewfile")
* @Method("GET")
* @Template()
* @ProjectAccess(grantType="VIEW")
*/
- public function viewFileAction($id,$currentFile = ''){
+ public function viewFileAction($id, $currentFile = '')
+ {
$filePath = '';
$dir = '';
$currentDir = '';
- if($currentFile){
+ if ($currentFile) {
$filePath = trim(urldecode($currentFile));
- try{
+ try {
$file = $this->gitFilesCommands->getFile($filePath, $this->branchName);
$fileContents = $this->gitFilesCommands->readFile($file);
- }catch (\Exception $e) {
+ } catch (\Exception $e) {
$this->get('session')->getFlashBag()->add('error', $e->getMessage());
}
-
+
$pathParts = pathinfo($filePath);
$dir = $pathParts['dirname'];
-
+
$pathParts = pathinfo($filePath);
- $currentDir = ($pathParts['dirname'] !== '.')?$pathParts['dirname']:'';
+ $currentDir = ($pathParts['dirname'] !== '.') ? $pathParts['dirname'] : '';
}
-
- return array_merge($this->viewVariables, array(
+
+ return array_merge($this->viewVariables, array(
'currentDir' => $currentDir,
'filePath' => $filePath,
'fileContents' => $fileContents,
- 'file' => $file
+ 'file' => $file,
));
}
-
-
+
/**
- *
- * @param integer $id Project Id
+ * @param int $id Project Id
*/
- public function initAction($id,$grantType = 'VIEW'){
-
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
return $redirectUrl;
}
-
- $this->gitFilesCommands = $this->gitCommands->command('files');
+ $this->gitFilesCommands = $this->gitCommands->command('files');
}
-
+
/**
* Adds File to .gitignore and remove file git index.
*
@@ -130,27 +125,26 @@ public function initAction($id,$grantType = 'VIEW'){
* @Template("VersionControlGitControlBundle:ProjectFiles:fileList.html.twig")
* @ProjectAccess(grantType="MASTER")
*/
- public function ignoreAction($id,$filePath){
+ public function ignoreAction($id, $filePath)
+ {
//$this->initAction($id,'MASTER');
$params = array('id' => $id);
-
+
$filePath = trim(urldecode($filePath));
$pathInfo = pathinfo($filePath);
- if(trim($pathInfo['dirname']) && $pathInfo['dirname'] != '.'){
+ if (trim($pathInfo['dirname']) && $pathInfo['dirname'] != '.') {
$currentDir = $pathInfo['dirname'];
$params['currentDir'] = $currentDir.'/';
}
-
- try{
+
+ try {
$response = $this->gitFilesCommands->ignoreFile($filePath, $this->branchName);
$this->get('session')->getFlashBag()->add('notice', $response);
- }catch (\Exception $e) {
+ } catch (\Exception $e) {
$this->get('session')->getFlashBag()->add('error', $e->getMessage());
}
-
+
return $this->redirect($this->generateUrl('project_filelist', $params));
}
-
}
-
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
similarity index 62%
rename from src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
index 2225e89..2f419f5 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php
@@ -1,258 +1,263 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller;
-
-use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-use VersionControl\GitControlBundle\Utility\GitCommands;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\HttpFoundation\Request;
-use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-
-/**
- * Project controller.
- *
- * @Route("/project/{id}/history")
- */
-class ProjectHistoryController extends BaseProjectController
-{
- /**
- *
- * @var GitCommand
- */
- protected $gitLogCommand;
-
-
- /**
- * Displays the project commit history for the current branch.
- *
- * @Route("/", name="project_log")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="VIEW")
- */
- public function listAction(Request $request,$id)
- {
-
- $currentPage = $request->query->get('page', 1);
- $filter = false;
- $keyword = '';
- //Search
- /*$keyword = $request->query->get('keyword', false);
- $filter= $request->query->get('filter', false);
- if($keyword !== false && trim($keyword) !== ''){
- if($filter !== false){
- if($filter === 'author'){
- $this->gitLogCommand->setFilterByAuthor($keyword);
- }elseif($filter === 'content'){
- $this->gitLogCommand->setFilterByContent($keyword);
- }else{
- $this->gitLogCommand->setFilterByMessage($keyword);
- }
- }
- }*/
-
- $searchForm = $this->createSearchForm();
- $searchForm->handleRequest($request);
-
- if ($searchForm->isValid()) {
- $data = $searchForm->getData();
-
- $keyword = $data['keyword'];
- $filter = $data['filter'];
- $branch = $data['branch'];
-
- if($keyword !== false && trim($keyword) !== ''){
- if($filter !== false){
- if($filter === 'author'){
- $this->gitLogCommand->setFilterByAuthor($keyword);
- }elseif($filter === 'content'){
- $this->gitLogCommand->setFilterByContent($keyword);
- }else{
- $this->gitLogCommand->setFilterByMessage($keyword);
- }
- }
- }
-
- $this->gitLogCommand->setBranch($branch)
- ->setPage(($currentPage-1));
-
- }else{
- $this->gitLogCommand->setBranch($this->branchName)
- ->setPage(($currentPage-1));
- }
-
- $gitLogs = $this->gitLogCommand->execute()->getResults();
-
- return array_merge($this->viewVariables, array(
-
- 'gitLogs' => $gitLogs,
- 'totalCount' => $this->gitLogCommand->getTotalCount(),
- 'limit' => $this->gitLogCommand->getLimit(),
- 'currentPage' => $this->gitLogCommand->getPage()+1,
- 'keyword' => $keyword,
- 'filter' => $filter,
- 'searchForm' => $searchForm->createView()
- ));
- }
-
- /**
- * Show Git commit diff
- *
- * @Route("/commit/{commitHash}", name="project_commitdiff")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="VIEW")
- */
- public function commitHistoryAction($id,$commitHash){
-
-
- $gitDiffCommand = $this->gitCommands->command('diff');
-
- $this->gitLogCommand
- ->setLogCount(1)
- ->setCommitHash($commitHash);
-
- //$gitLog = $this->gitFilesCommands->getCommitLog($commitHash,$this->branchName);
- $gitLog = $this->gitLogCommand->execute()->getFirstResult();
-
- //Get git Diff
- //$gitDiffs = $gitDiffCommand->getCommitDiff($commitHash);
- $files = $gitDiffCommand->getFilesInCommit($commitHash);
-
-
- return array_merge($this->viewVariables, array(
- 'log' => $gitLog,
- //'diffs' => $gitDiffs,
- 'files' => $files,
- 'commitHash' => $commitHash
- ));
- }
-
- /**
- * Show Git commit diff
- *
- * @Route("/commitfile/{commitHash}/{filePath}", name="project_commitfilediff")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="VIEW")
- */
- public function fileDiffAction($id,$commitHash,$filePath){
-
-
- $gitDiffCommand = $this->gitCommands->command('diff');
-
- $difffile = urldecode($filePath);
-
- $previousCommitHash = $gitDiffCommand->getPreviousCommitHash($commitHash);
-
- $gitDiffs = $gitDiffCommand->getDiffFileBetweenCommits($difffile,$previousCommitHash,$commitHash);
-
- return array_merge($this->viewVariables, array(
- 'diffs' => $gitDiffs,
- ));
- }
-
- /**
- * Show Git commit diff
- *
- * @Route("/checkout-file/{commitHash}/{filePath}", name="project_checkout_file")
- * @Method("GET")
- * @ProjectAccess(grantType="VIEW")
- */
- public function checkoutFileAction($id,$commitHash,$filePath){
-
-
- $gitUndoCommand = $this->gitCommands->command('undo');
-
- $file = urldecode($filePath);
- try{
- $response = $gitUndoCommand->checkoutFile($file,$commitHash);
-
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('warning', "Make sure to commit the changes.");
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return $this->redirect($this->generateUrl('project_commitdiff', array('id' => $id,'commitHash' => $commitHash)));
-
- }
-
- /**
- *
- * @param integer $id Project Id
- */
- public function initAction($id, $grantType = 'VIEW'){
-
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
- return $redirectUrl;
- }
-
- $this->gitLogCommand = $this->gitCommands->command('log');
-
- }
-
- /**
- * Creates a form to edit a Project entity.
- *
- * @param Project $project The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createSearchForm()
- {
-
- //$remoteChoices = array();
- //foreach($gitRemoteVersions as $remoteVersion){
- // $remoteChoices[$remoteVersion[0]] = $remoteVersion[0].'('.$remoteVersion[1].')';
- //}
-
- //Local Branch choice
- $branches = $this->gitCommands->command('branch')->getBranches(true);
- $branchChoices = array();
- foreach($branches as $branchName){
- $branchChoices[$branchName] = $branchName;
- }
-
- //Current branch
- $currentBranch = $this->gitCommands->command('branch')->getCurrentBranch();
-
-
- $defaultData = array('branch' => $currentBranch);
- $form = $this->createFormBuilder($defaultData, array(
- 'action' => $this->generateUrl('project_log', array('id' => $this->project->getId())),
- 'method' => 'GET',
- ))
- ->add('branch', 'choice', array(
- 'label' => 'Branch'
- ,'choices' => $branchChoices
- ,'preferred_choices' => array($currentBranch)
- ,'data' => trim($currentBranch)
- ,'required' => false
- ,'constraints' => array(
- //new NotBlank()
- ))
- )
- ->add('filter','hidden')
- ->add('keyword','text',array('required' => false))
- ->getForm();
-
- //$form->add('submitMain', 'submit', array('label' => 'Push'));
- return $form;
- }
-}
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use VersionControl\GitCommandBundle\GitCommands\GitCommand;
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\HttpFoundation\Request;
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+
+/**
+ * Project controller.
+ *
+ * @Route("/project/{id}/history")
+ */
+class ProjectHistoryController extends BaseProjectController
+{
+ /**
+ * @var GitCommand
+ */
+ protected $gitLogCommand;
+
+ /**
+ * Displays the project commit history for the current branch.
+ *
+ * @Route("/", name="project_log")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function listAction(Request $request, $id)
+ {
+ $currentPage = $request->query->get('page', 1);
+ $filter = false;
+ $keyword = '';
+ //Search
+ /*$keyword = $request->query->get('keyword', false);
+ $filter= $request->query->get('filter', false);
+ if($keyword !== false && trim($keyword) !== ''){
+ if($filter !== false){
+ if($filter === 'author'){
+ $this->gitLogCommand->setFilterByAuthor($keyword);
+ }elseif($filter === 'content'){
+ $this->gitLogCommand->setFilterByContent($keyword);
+ }else{
+ $this->gitLogCommand->setFilterByMessage($keyword);
+ }
+ }
+ }*/
+
+ $searchForm = $this->createSearchForm();
+ $searchForm->handleRequest($request);
+
+ if ($searchForm->isValid()) {
+ $data = $searchForm->getData();
+
+ $keyword = $data['keyword'];
+ $filter = $data['filter'];
+ $branch = $data['branch'];
+
+ if ($keyword !== false && trim($keyword) !== '') {
+ if ($filter !== false) {
+ if ($filter === 'author') {
+ $this->gitLogCommand->setFilterByAuthor($keyword);
+ } elseif ($filter === 'content') {
+ $this->gitLogCommand->setFilterByContent($keyword);
+ } else {
+ $this->gitLogCommand->setFilterByMessage($keyword);
+ }
+ }
+ }
+
+ $this->gitLogCommand->setBranch($branch)
+ ->setPage(($currentPage - 1));
+ } else {
+ $this->gitLogCommand->setBranch($this->branchName)
+ ->setPage(($currentPage - 1));
+ }
+
+ $gitLogs = $this->gitLogCommand->execute()->getResults();
+
+ return array_merge($this->viewVariables, array(
+
+ 'gitLogs' => $gitLogs,
+ 'totalCount' => $this->gitLogCommand->getTotalCount(),
+ 'limit' => $this->gitLogCommand->getLimit(),
+ 'currentPage' => $this->gitLogCommand->getPage() + 1,
+ 'keyword' => $keyword,
+ 'filter' => $filter,
+ 'searchForm' => $searchForm->createView(),
+ ));
+ }
+
+ /**
+ * Show Git commit diff.
+ *
+ * @Route("/commit/{commitHash}", name="project_commitdiff")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function commitHistoryAction($id, $commitHash)
+ {
+ $gitDiffCommand = $this->gitCommands->command('diff');
+
+ $this->gitLogCommand
+ ->setLogCount(1)
+ ->setCommitHash($commitHash);
+
+ //$gitLog = $this->gitFilesCommands->getCommitLog($commitHash,$this->branchName);
+ $gitLog = $this->gitLogCommand->execute()->getFirstResult();
+
+ //Get git Diff
+ $files = $gitDiffCommand->getFilesInCommit($commitHash);
+
+ return array_merge($this->viewVariables, array(
+ 'log' => $gitLog,
+ //'diffs' => $gitDiffs,
+ 'files' => $files,
+ 'commitHash' => $commitHash,
+ ));
+ }
+
+ /**
+ * Show Git commit diff.
+ *
+ * @Route("/commitfile/{commitHash}/{filePath}/{diffCommitHash}", name="project_commitfilediff" , defaults={"diffCommitHash" = 0})
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function fileDiffAction($id, $commitHash, $filePath, $diffCommitHash)
+ {
+ $gitDiffCommand = $this->gitCommands->command('diff');
+
+ $difffile = urldecode($filePath);
+
+ if ($diffCommitHash) {
+ $previousCommitHash = $diffCommitHash;
+ } else {
+ $previousCommitHash = $gitDiffCommand->getPreviousCommitHash($commitHash, $difffile);
+ }
+ if (!$previousCommitHash) {
+ $previousCommitHash = 'HEAD';
+ }
+
+ $gitDiffs = $gitDiffCommand->getDiffFileBetweenCommits($difffile, $previousCommitHash, $commitHash);
+
+ $this->gitLogCommand
+ ->setLogCount(60)
+ ->setCommitHash($commitHash)
+ ->setPath($difffile)
+ ->setLimit(60);
+
+ $gitPreviousLogs = $this->gitLogCommand->execute()->getResults();
+
+ //First element is current commit so need to remove first element
+ array_shift($gitPreviousLogs);
+
+ return array_merge($this->viewVariables, array(
+ 'diffs' => $gitDiffs,
+ 'previousLogs' => $gitPreviousLogs,
+ 'commitHash' => $commitHash,
+ 'diffCommitHash' => $previousCommitHash,
+ 'filePath' => $difffile,
+ ));
+ }
+
+ /**
+ * Show Git commit diff.
+ *
+ * @Route("/checkout-file/{commitHash}/{filePath}", name="project_checkout_file")
+ * @Method("GET")
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function checkoutFileAction($id, $commitHash, $filePath)
+ {
+ $gitUndoCommand = $this->gitCommands->command('undo');
+
+ $file = urldecode($filePath);
+ try {
+ $response = $gitUndoCommand->checkoutFile($file, $commitHash);
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('warning', 'Make sure to commit the changes.');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_commitdiff', array('id' => $id, 'commitHash' => $commitHash)));
+ }
+
+ /**
+ * @param int $id Project Id
+ */
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
+ return $redirectUrl;
+ }
+
+ $this->gitLogCommand = $this->gitCommands->command('log');
+ }
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $project The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createSearchForm()
+ {
+
+ //$remoteChoices = array();
+ //foreach($gitRemoteVersions as $remoteVersion){
+ // $remoteChoices[$remoteVersion[0]] = $remoteVersion[0].'('.$remoteVersion[1].')';
+ //}
+
+ //Local Branch choice
+ $branches = $this->gitCommands->command('branch')->getBranches(true);
+ $branchChoices = array();
+ foreach ($branches as $branchName) {
+ $branchChoices[$branchName] = $branchName;
+ }
+
+ //Current branch
+ $currentBranch = $this->gitCommands->command('branch')->getCurrentBranch();
+
+ $defaultData = array('branch' => $currentBranch);
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl('project_log', array('id' => $this->project->getId())),
+ 'method' => 'GET',
+ ))
+ ->add('branch', ChoiceType::class, array(
+ 'label' => 'Branch', 'choices' => $branchChoices, 'preferred_choices' => array($currentBranch), 'data' => trim($currentBranch), 'required' => false, 'choices_as_values' => true, 'constraints' => array(
+ //new NotBlank()
+ ), )
+ )
+ ->add('filter', HiddenType::class)
+ ->add('keyword', TextType::class, array('required' => false))
+ ->getForm();
+
+ //$form->add('submitMain', 'submit', array('label' => 'Push'));
+ return $form;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectIndexController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectIndexController.php
similarity index 87%
rename from src/VersionControl/GitControlBundle/Controller/ProjectIndexController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectIndexController.php
index e157a77..6d3365f 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectIndexController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectIndexController.php
@@ -7,34 +7,31 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-
use Symfony\Component\HttpFoundation\JsonResponse;
+
/**
* Project controller.
*
* @Route("/project/{id}")
- *
*/
class ProjectIndexController extends BaseProjectController
{
-
/**
- * Allow access by ajax only request
- * @var boolean
+ * Allow access by ajax only request.
+ *
+ * @var bool
*/
protected $ajaxOnly = false;
-
+
/**
* Get stats as json object.
*
@@ -46,22 +43,21 @@ public function statusAction(Request $request)
{
//Get latest from updates from remot branches
$this->gitCommands->command('branch')->fetchAll();
-
+
$pushPullCommitCount = $this->gitCommands->command('sync')->commitCountWithRemote($this->branchName);
-
+
$statusCount = $this->gitCommands->command('commit')->countStatus();
-
+
$response = array(
'success' => true,
'pushCount' => $pushPullCommitCount['pushCount'],
'pullCount' => $pushPullCommitCount['pullCount'],
- 'statusCount' => $statusCount
+ 'statusCount' => $statusCount,
);
-
+
return new JsonResponse($response);
-
}
-
+
/**
* Lists all Project entities.
*
@@ -70,27 +66,25 @@ public function statusAction(Request $request)
* @Template()
* @ProjectAccess(grantType="VIEW")
*/
- public function indexAction(Request $request,$section= "")
+ public function indexAction(Request $request, $section = '')
{
- if($section){
+ if ($section) {
$section = urldecode($section);
}
-
+
//Get latest from updates from remot branches
$response = $this->gitCommands->command('branch')->fetchAll();
-
+
$pushPullCommitCount = $this->gitCommands->command('sync')->commitCountWithRemote($this->branchName);
-
+
$statusCount = $this->gitCommands->command('commit')->countStatus();
//$this->get('session')->getFlashBag()->add('notice', $response);
-
+
return array_merge($this->viewVariables, array(
'pushPullCommitCount' => $pushPullCommitCount,
'statusCount' => $statusCount,
'section' => $section,
));
}
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectIssueIntegratorController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectIssueIntegratorController.php
similarity index 78%
rename from src/VersionControl/GitControlBundle/Controller/ProjectIssueIntegratorController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectIssueIntegratorController.php
index 3f0d731..50080cc 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectIssueIntegratorController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectIssueIntegratorController.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
@@ -16,31 +17,27 @@
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use VersionControl\GitControlBundle\Entity\Project;
use VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator;
-use VersionControl\GitControlBundle\Form\ProjectIssueIntegratorType;
-
-use VersionControl\GithubIssueBundle\Entity\ProjectIssueIntegratorGithub;
-use VersionControl\GithubIssueBundle\Form\ProjectIssueIntegratorGithubType;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
/**
* Project controller.
*
* @Route("/project/{id}/issue-integrator")
*/
-class ProjectIssueIntegratorController extends BaseProjectController{
+class ProjectIssueIntegratorController extends BaseProjectController
+{
//put your code here
protected $projectGrantType = 'OWNER';
-
+
/**
- * Allow access by ajax only request
- * @var boolean
+ * Allow access by ajax only request.
+ *
+ * @var bool
*/
protected $ajaxOnly = false;
-
+
/**
* Deletes a ProjectIssueIntegrator entity.
*
@@ -50,7 +47,6 @@ class ProjectIssueIntegratorController extends BaseProjectController{
*/
public function deleteAction(Request $request, $id, $integratorId)
{
-
$form = $this->createDeleteForm($integratorId);
$form->handleRequest($request);
@@ -62,15 +58,15 @@ public function deleteAction(Request $request, $id, $integratorId)
throw $this->createNotFoundException('Unable to find ProjectIssueIntegrator entity.');
}
$project = $issueIntegrator->getProject();
- $this->checkProjectAuthorization($project,'OWNER');
-
+ $this->checkProjectAuthorization($project, 'OWNER');
+
$em->remove($issueIntegrator);
$em->flush();
}
return $this->redirect($this->generateUrl('project_issue_integrator'));
}
-
+
/**
* Creates a form to delete a ProjectIssueIntegrator entity by id.
*
@@ -83,29 +79,26 @@ private function createDeleteForm($integratorId)
return $this->createFormBuilder()
->setAction($this->generateUrl('project_issue_integrator_delete', array('integratorId' => $integratorId)))
->setMethod('DELETE')
- ->add('submit', 'submit', array('label' => 'Delete'))
+ ->add('submit', SubmitType::class, array('label' => 'Delete'))
->getForm()
;
}
-
/**
* @Route("/", name="project_issue_integrator")
* @Template()
* @ProjectAccess(grantType="OWNER")
*/
- public function indexAction($id){
-
+ public function indexAction($id)
+ {
$em = $this->getDoctrine()->getManager();
$issues = array();
- $issueIntegrator= $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
+ $issueIntegrator = $em->getRepository('VersionControlGitControlBundle:ProjectIssueIntegrator')->findOneByProject($this->project);
return array_merge($this->viewVariables, array(
'issues' => $issues,
- 'issueIntegrator' => $issueIntegrator
+ 'issueIntegrator' => $issueIntegrator,
));
-
}
-
}
diff --git a/app/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php
new file mode 100644
index 0000000..9a94016
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php
@@ -0,0 +1,257 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use VersionControl\GitCommandBundle\GitCommands\GitCommand;
+use Symfony\Component\HttpFoundation\Request;
+/* ///Route("/example", service="example_bundle.controller.example_controller") */
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+
+/**
+ * Project controller.
+ *
+ * @Route("/project/{id}/remote")
+ */
+class ProjectRemoteController extends BaseProjectController
+{
+ /**
+ * @var GitCommand
+ */
+ protected $gitCommands;
+
+ /**
+ * @var GitCommand
+ */
+ protected $gitSyncCommands;
+
+ protected $projectGrantType = 'EDIT';
+
+ /**
+ * Form to choose which brabch and remote a user will pull.
+ * This is just the form. Also see pullToLocal().
+ *
+ * @Route("/", name="project_listremote")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function listAction($id)
+ {
+ $gitRemoteVersions = array();
+ try {
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'remotes' => $gitRemoteVersions,
+ 'branchName' => $this->branchName,
+ ));
+ }
+
+ /**
+ * Form to choose which brabch and remote a user will pull.
+ * This is just the form. Also see pullToLocal().
+ *
+ * @Route("/new/", name="project_newremote")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function newAction($id)
+ {
+ $remoteForm = $this->createRemoteForm();
+
+ return array_merge($this->viewVariables, array(
+ 'remote_form' => $remoteForm->createView(),
+ 'branchName' => $this->branchName,
+ ));
+ }
+
+ /**
+ * Form to choose which brabch and remote a user will pull.
+ * This is just the form. Also see pullToLocal().
+ *
+ * @Route("/create/", name="project_createremote")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectRemote:new.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function createAction(Request $request, $id)
+ {
+ $addRemoteForm = $this->createRemoteForm();
+ $addRemoteForm->handleRequest($request);
+
+ if ($addRemoteForm->isValid()) {
+ $data = $addRemoteForm->getData();
+ $remote = $data['remoteName'];
+ $url = $data['remoteUrl'];
+
+ try {
+ //Remote Server choice
+ $response = $this->gitSyncCommands->addRemote($remote, $url);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'pull_form' => $addRemoteForm->createView(),
+ 'diffs' => array(),
+ ));
+ }
+
+ /**
+ * Form to choose which brabch and remote a user will pull.
+ * This is just the form. Also see pullToLocal().
+ *
+ * @Route("/delete/{remote}", name="project_deleteremote")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function deleteAction(Request $request, $id, $remote)
+ {
+ try {
+ $response = $this->gitSyncCommands->deleteRemote($remote);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
+ }
+
+ /**
+ * Create rename remote form.
+ *
+ * @Route("/rename/{remote}", name="project_renameremote")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function renameAction(Request $request, $id, $remote)
+ {
+ $defaultData = array('remoteName' => $remote);
+ $renameRemoteForm = $this->createRenameRemoteForm($defaultData);
+
+ return array_merge($this->viewVariables, array(
+ 'remote_form' => $renameRemoteForm->createView(),
+ 'branchName' => $this->branchName,
+ ));
+ }
+
+ /**
+ * Changes the name of the remote repositiory in git for the local branch.
+ *
+ * @Route("/rename/{remote}", name="project_remoteupdate")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectRemote:rename.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function updateAction(Request $request, $id)
+ {
+ $renameRemoteForm = $this->createRenameRemoteForm();
+
+ $renameRemoteForm->handleRequest($request);
+
+ if ($renameRemoteForm->isValid()) {
+ $data = $renameRemoteForm->getData();
+ $remoteName = $data['remoteName'];
+ $newRemoteName = $data['newRemoteName'];
+
+ try {
+ $response = $this->gitSyncCommands->renameRemote($remoteName, $newRemoteName);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'remote_form' => $renameRemoteForm->createView(),
+ 'branchName' => $this->branchName,
+ ));
+ }
+
+ /**
+ * @param int $id
+ */
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
+ return $redirectUrl;
+ }
+ $this->gitSyncCommands = $this->gitCommands->command('sync');
+ }
+
+ private function createRemoteForm()
+ {
+ $defaultData = array();
+
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl('project_createremote', array('id' => $this->project->getId())),
+ 'method' => 'POST',
+ ))
+ ->add('remoteName', TextType::class, array(
+ 'label' => 'Remote Name', 'required' => false, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('remoteUrl', TextType::class, array(
+ 'label' => 'Remote Url', 'required' => false, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )->add('submit', SubmitType::class, array('label' => 'Add'))
+
+ ->getForm();
+
+ return $form;
+ }
+
+ private function createRenameRemoteForm($defaultData = array())
+ {
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl('project_createremote', array('id' => $this->project->getId())),
+ 'method' => 'POST',
+ ))
+ ->add('remoteName', HiddenType::class, array(
+ 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('newRemoteName', TextType::class, array(
+ 'label' => 'New Remote Name', 'required' => false, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )->add('submit', SubmitType::class, array('label' => 'Rename'))
+
+ ->getForm();
+
+ return $form;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectSyncController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectSyncController.php
similarity index 60%
rename from src/VersionControl/GitControlBundle/Controller/ProjectSyncController.php
rename to app/src/VersionControl/GitControlBundle/Controller/ProjectSyncController.php
index 504a17f..4474843 100644
--- a/src/VersionControl/GitControlBundle/Controller/ProjectSyncController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectSyncController.php
@@ -1,263 +1,234 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller;
-
-use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-use VersionControl\GitCommandBundle\GitCommands\GitCommand;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\HttpFoundation\Request;
-use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-
-/**
- * Project controller.
- *
- * @Route("/project/{id}/sync/")
- */
-class ProjectSyncController extends BaseProjectController
-{
-
- /**
- *
- * @var GitCommand
- */
- protected $gitCommands;
-
- /**
- *
- * @var GitCommand
- */
- protected $gitSyncCommands;
-
- /**
- * Finds and displays a Project entity.
- *
- * @Route("push/", name="project_push")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="MASTER")
- */
- public function pushAction()
- {
-
- //Remote Server choice
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
-
- $pushForm = $this->createPushPullForm($this->project);
- $pushForm->add('push', 'submit', array('label' => 'Push'));
-
- return array_merge($this->viewVariables, array(
- 'remoteVersions' => $gitRemoteVersions,
- 'push_form' => $pushForm->createView()
- ));
- }
-
- /**
- * Finds and displays a Project entity.
- *
- * @Route("pushremote/", name="project_pushremote")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectSync:push.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function pushToRemoteAction(Request $request,$id)
- {
-
-
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
-
- $pushForm = $this->createPushPullForm($this->project);
- $pushForm->add('push', 'submit', array('label' => 'Push'));
- $pushForm->handleRequest($request);
-
- if ($pushForm->isValid()) {
- $data = $pushForm->getData();
- $remote = $data['remote'];
- $branch = $data['branch'];
- try{
- $response = $this->gitSyncCommands->push($remote,$branch);
-
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('status-refresh','true');
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_push', array('id' => $id)));
- }
-
- return array_merge($this->viewVariables, array(
- 'remoteVersions' => $gitRemoteVersions,
- 'push_form' => $pushForm->createView()
- ));
-
- }
-
-
- /**
- * Form to choose which brabch and remote a user will pull.
- * This is just the form. Also see pullToLocal()
- *
- * @Route("pull/", name="project_pull")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="MASTER")
- */
- public function pullAction()
- {
-
-
- //Remote Server choice
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
-
- $pullForm = $this->createPushPullForm($this->project,"project_pulllocal");
- $pullForm->add('pull', 'submit', array('label' => 'Pull'));
- $pullForm->add('viewDiff', 'submit', array('label' => 'View Diff'));
-
- return array_merge($this->viewVariables, array(
- 'remoteVersions' => $gitRemoteVersions,
- 'pull_form' => $pullForm->createView(),
- 'diffs' => array()
- ));
-
- }
-
- /**
- * Pulls git repository from remote to local.
- *
- * @Route("pulllocal/", name="project_pulllocal")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectSync:pull.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function pullToLocalAction(Request $request,$id)
- {
- $diffs = array();
-
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
-
- $pullForm = $this->createPushPullForm($this->project,"project_pulllocal");
- $pullForm->add('pull', 'submit', array('label' => 'Pull'));
- $pullForm->add('viewDiff', 'submit', array('label' => 'View Diff'));
- $pullForm->handleRequest($request);
-
- if ($pullForm->isValid()) {
- $data = $pullForm->getData();
- $remote = $data['remote'];
- $branch = $data['branch'];
- //die('form valid');
- if($pullForm->get('viewDiff')->isClicked()){
- $response = $this->gitSyncCommands->fetch($remote,$branch);
- $this->get('session')->getFlashBag()->add('notice', $response);
- $diffs = $this->gitCommands->getDiffRemoteBranch($remote,$branch);
-
- }else{
- try{
- $response = $this->gitSyncCommands->pull($remote,$branch);
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('status-refresh','true');
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return $this->redirect($this->generateUrl('project_pull', array('id' => $id)));
- }
-
- }
-
- return array_merge($this->viewVariables, array(
- 'remoteVersions' => $gitRemoteVersions,
- 'pull_form' => $pullForm->createView(),
- 'diffs' => $diffs
- ));
-
- }
-
-
-
- /**
- *
- *
- */
- public function initAction($id, $grantType = 'VIEW'){
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
- return $redirectUrl;
- }
- $this->gitSyncCommands = $this->gitCommands->command('sync');
- }
-
- /**
- * Creates a form to edit a Project entity.
- *
- * @param Project $project The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createPushPullForm($project,$formAction = 'project_pushremote')
- {
- //Remote Server choice
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
- $remoteChoices = array();
- foreach($gitRemoteVersions as $remoteVersion){
- $remoteChoices[$remoteVersion[0]] = $remoteVersion[0].'('.$remoteVersion[1].')';
- }
-
- //Local Branch choice
- $branches = $this->gitCommands->command('branch')->getBranches(true);
- $branchChoices = array();
- foreach($branches as $branchName){
- $branchChoices[$branchName] = $branchName;
- }
-
- //Current branch
- $currentBranch = $this->gitCommands->command('branch')->getCurrentBranch();
-
- reset($remoteChoices);
- $firstOrigin = key($remoteChoices);
-
- $defaultData = array('branch' => $currentBranch);
- $form = $this->createFormBuilder($defaultData, array(
- 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
- 'method' => 'POST',
- ))
- ->add('remote', 'choice', array(
- 'label' => 'Remote Server'
- ,'choices' => $remoteChoices
- ,'data' => $firstOrigin
- ,'required' => false
- ,'constraints' => array(
- new NotBlank()
- ))
- )
- ->add('branch', 'choice', array(
- 'label' => 'Branch'
- ,'choices' => $branchChoices
- ,'preferred_choices' => array($currentBranch)
- ,'data' => trim($currentBranch)
- ,'required' => false
- ,'constraints' => array(
- new NotBlank()
- ))
- )
- ->getForm();
-
- //$form->add('submitMain', 'submit', array('label' => 'Push'));
- return $form;
- }
-
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use VersionControl\GitCommandBundle\GitCommands\GitCommand;
+use Symfony\Component\HttpFoundation\Request;
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+
+/**
+ * Project controller.
+ *
+ * @Route("/project/{id}/sync/")
+ */
+class ProjectSyncController extends BaseProjectController
+{
+ /**
+ * @var GitCommand
+ */
+ protected $gitCommands;
+
+ /**
+ * @var GitCommand
+ */
+ protected $gitSyncCommands;
+
+ /**
+ * Finds and displays a Project entity.
+ *
+ * @Route("push/", name="project_push")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function pushAction()
+ {
+
+ //Remote Server choice
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+
+ $pushForm = $this->createPushPullForm($this->project);
+ $pushForm->add('push', SubmitType::class, array('label' => 'Push'));
+
+ return array_merge($this->viewVariables, array(
+ 'remoteVersions' => $gitRemoteVersions,
+ 'push_form' => $pushForm->createView(),
+ ));
+ }
+
+ /**
+ * Finds and displays a Project entity.
+ *
+ * @Route("pushremote/", name="project_pushremote")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectSync:push.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function pushToRemoteAction(Request $request, $id)
+ {
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+
+ $pushForm = $this->createPushPullForm($this->project);
+ $pushForm->add('push', SubmitType::class, array('label' => 'Push'));
+ $pushForm->handleRequest($request);
+
+ if ($pushForm->isValid()) {
+ $data = $pushForm->getData();
+ $remote = $data['remote'];
+ $branch = $data['branch'];
+ try {
+ $response = $this->gitSyncCommands->push($remote, $branch);
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_push', array('id' => $id)));
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'remoteVersions' => $gitRemoteVersions,
+ 'push_form' => $pushForm->createView(),
+ ));
+ }
+
+ /**
+ * Form to choose which brabch and remote a user will pull.
+ * This is just the form. Also see pullToLocal().
+ *
+ * @Route("pull/", name="project_pull")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function pullAction()
+ {
+
+ //Remote Server choice
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+
+ $pullForm = $this->createPushPullForm($this->project, 'project_pulllocal');
+ $pullForm->add('pull', SubmitType::class, array('label' => 'Pull'));
+ $pullForm->add('viewDiff', SubmitType::class, array('label' => 'View Diff'));
+
+ return array_merge($this->viewVariables, array(
+ 'remoteVersions' => $gitRemoteVersions,
+ 'pull_form' => $pullForm->createView(),
+ 'diffs' => array(),
+ ));
+ }
+
+ /**
+ * Pulls git repository from remote to local.
+ *
+ * @Route("pulllocal/", name="project_pulllocal")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectSync:pull.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function pullToLocalAction(Request $request, $id)
+ {
+ $diffs = array();
+
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+
+ $pullForm = $this->createPushPullForm($this->project, 'project_pulllocal');
+ $pullForm->add('pull', SubmitType::class, array('label' => 'Pull'));
+ $pullForm->add('viewDiff', SubmitType::class, array('label' => 'View Diff'));
+ $pullForm->handleRequest($request);
+
+ if ($pullForm->isValid()) {
+ $data = $pullForm->getData();
+ $remote = $data['remote'];
+ $branch = $data['branch'];
+ //die('form valid');
+ if ($pullForm->get('viewDiff')->isClicked()) {
+ $response = $this->gitSyncCommands->fetch($remote, $branch);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $diffs = $this->gitCommands->getDiffRemoteBranch($remote, $branch);
+ } else {
+ try {
+ $response = $this->gitSyncCommands->pull($remote, $branch);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_pull', array('id' => $id)));
+ }
+ }
+
+ return array_merge($this->viewVariables, array(
+ 'remoteVersions' => $gitRemoteVersions,
+ 'pull_form' => $pullForm->createView(),
+ 'diffs' => $diffs,
+ ));
+ }
+
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
+ return $redirectUrl;
+ }
+ $this->gitSyncCommands = $this->gitCommands->command('sync');
+ }
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $project The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createPushPullForm($project, $formAction = 'project_pushremote')
+ {
+ //Remote Server choice
+ $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
+ $remoteChoices = array();
+ foreach ($gitRemoteVersions as $remoteVersion) {
+ $remoteChoices[$remoteVersion[0].'('.$remoteVersion[1].')'] = $remoteVersion[0];
+ }
+
+ //Local Branch choice
+ $branches = $this->gitCommands->command('branch')->getBranches(true);
+ $branchChoices = array();
+ foreach ($branches as $branchName) {
+ $branchChoices[$branchName] = $branchName;
+ }
+
+ //Current branch
+ $currentBranch = $this->gitCommands->command('branch')->getCurrentBranch();
+
+ $firstOrigin = reset($remoteChoices);
+
+ $defaultData = array('branch' => $currentBranch);
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
+ 'method' => 'POST',
+ ))
+ ->add('remote', ChoiceType::class, array(
+ 'label' => 'Remote Server', 'choices' => $remoteChoices, 'data' => $firstOrigin, 'required' => false, 'choices_as_values' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('branch', ChoiceType::class, array(
+ 'label' => 'Branch', 'choices' => $branchChoices, 'preferred_choices' => array($currentBranch), 'data' => trim($currentBranch), 'required' => false, 'choices_as_values' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->getForm();
+
+ //$form->add('submitMain', SubmitType::class, array('label' => 'Push'));
+ return $form;
+ }
+}
diff --git a/app/src/VersionControl/GitControlBundle/Controller/ProjectTagController.php b/app/src/VersionControl/GitControlBundle/Controller/ProjectTagController.php
new file mode 100644
index 0000000..ee4567c
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Controller/ProjectTagController.php
@@ -0,0 +1,215 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\HttpFoundation\Request;
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+
+/**
+ * Project tag controller.
+ *
+ * @Route("/project/{id}/tag")
+ */
+class ProjectTagController extends BaseProjectController
+{
+ /**
+ * List Tags.
+ *
+ * @Route("s/", name="project_tags")
+ * @Method("GET")
+ * @Template()
+ * @ProjectAccess(grantType="VIEW")
+ */
+ public function tagsAction()
+ {
+ $tags = $this->gitCommands->command('tag')->getTags();
+
+ $defaultData =array();
+ $form = $this->createNewTagForm($this->project, $defaultData);
+
+ return array_merge($this->viewVariables, array(
+ 'form' => $form->createView(),
+ 'tags' => $tags,
+ ));
+ }
+
+ /**
+ * Creates a new tag
+ *
+ * @Route("/create/", name="project_tag")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:ProjectTag:tags.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function createTagAction(Request $request, $id)
+ {
+ $form = $this->createNewTagForm($this->project);
+ $form->handleRequest($request);
+
+ if ($form->isValid()) {
+ $data = $form->getData();
+ $tagVersion = $data['name'];
+ $tagMessage = $data['message'];
+ $tagCommit = $data['commit'];
+ try {
+ $response = $this->gitCommands->command('tag')->createAnnotatedTag($tagVersion, $tagMessage, $tagCommit);
+ $this->get('session')->getFlashBag()->add('notice', $response);
+
+ return $this->redirect($this->generateUrl('project_tags', array('id' => $id)));
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+ }
+
+ $tags = $this->gitCommands->command('tag')->getTags();
+
+ return array_merge($this->viewVariables, array(
+ 'form' => $form->createView(),
+ 'tags' => $tags,
+ ));
+ }
+
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createNewTagForm($project, $defaultData = array(), $formAction = 'project_tag')
+ {
+
+ //$defaultData = array();
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl($formAction, array('id' => $project->getId())),
+ 'method' => 'POST',
+ ))
+ ->add('name', TextType::class, array(
+ 'label' => 'Tag Name', 'required' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('message', TextType::class, array(
+ 'label' => 'Tag Message', 'required' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('commit', HiddenType::class)
+ ->getForm();
+
+ $form->add('submit', SubmitType::class, array('label' => 'Add Tag'));
+
+ return $form;
+ }
+
+
+ /**
+ * Form to handle pushing tags to remote
+ *
+ * @Route("/push/{tag}/{responseType}", name="project_push_tag", defaults={"responseType" = null})
+ * @Method({"GET", "POST"})
+ * @Template()
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function pushTagAction(Request $request, $tag, $responseType)
+ {
+ $success = true;
+ $form = $this->createPushTagForm($this->project,$tag);
+ $form->add('push', SubmitType::class, array('label' => 'Push'));
+
+ $form->handleRequest($request);
+
+ if ($form->isSubmitted()) {
+ if ($form->isValid()) {
+ $formData = $form->getData();
+ $remote = $formData['remote'];
+ $tag = $formData['tag'];
+
+ try {
+ $response = $this->gitCommands->command('tag')->pushTag($remote, $tag);
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ //return $this->redirect($this->generateUrl('project_push', array('id' => $id)));
+ $data = ['redirect' => $this->generateUrl('project_tags', array('id' => $this->project->getId()))];
+
+ return $this->viewHandler($data, 'json', true);
+
+ } else {
+ $success = false;
+ }
+ }
+
+ //Remote Server choice
+ $gitRemoteVersions = $this->gitCommands->command('sync')->getRemoteVersions();
+
+ $content = $this->render('VersionControlGitControlBundle:ProjectTag:pushTag.html.twig',
+ array_merge($this->viewVariables, array(
+ 'remoteVersions' => $gitRemoteVersions,
+ 'push_form' => $form->createView()
+ )
+ ));
+
+ return $this->viewHandler($content, $responseType, $success);
+ }
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $project The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createPushTagForm($project, $tag)
+ {
+ //Remote Server choice
+ $gitRemoteVersions = $this->gitCommands->command('sync')->getRemoteVersions();
+ $remoteChoices = array();
+ foreach ($gitRemoteVersions as $remoteVersion) {
+ $remoteChoices[$remoteVersion[0].'('.$remoteVersion[1].')'] = $remoteVersion[0];
+ }
+
+ $firstOrigin = reset($remoteChoices);
+
+ $defaultData = array('tag' => $tag);
+
+ $form = $this->createFormBuilder($defaultData, array(
+ 'action' => $this->generateUrl('project_push_tag', array('id' => $project->getId(), 'tag'=> $tag, 'responseType' => 'json')),
+ 'method' => 'POST',
+ ))
+ ->add('remote', ChoiceType::class, array(
+ 'label' => 'Remote Server', 'choices' => $remoteChoices, 'data' => $firstOrigin, 'required' => false, 'choices_as_values' => true, 'constraints' => array(
+ new NotBlank(),
+ ), )
+ )
+ ->add('tag', HiddenType::class)
+ ->getForm();
+
+ return $form;
+ }
+
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/UndoCommitController.php b/app/src/VersionControl/GitControlBundle/Controller/UndoCommitController.php
similarity index 75%
rename from src/VersionControl/GitControlBundle/Controller/UndoCommitController.php
rename to app/src/VersionControl/GitControlBundle/Controller/UndoCommitController.php
index 034def8..279fb44 100644
--- a/src/VersionControl/GitControlBundle/Controller/UndoCommitController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/UndoCommitController.php
@@ -1,125 +1,115 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller;
-
-use Symfony\Component\HttpFoundation\Request;
-use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-
-/**
- * Project controller.
- *
- * @Route("/project/{id}/undo")
- */
-class UndoCommitController extends BaseProjectController
-{
-
- protected $gitUndoCommands;
-
- protected $projectGrantType = 'OPERATOR';
-
-
- /**
- * Action to do a soft undo on the last commit. This will
- * allow you to fix any messages in the last commit. This
- * will not effect any files.
- *
- * @Route("/softcommit/", name="undocommit_soft")
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:Error:request.html.twig")
- * @ProjectAccess(grantType="EDIT")
- */
- public function undoSoftCommitAction($id, Request $request){
-
- try{
- $response = $this->gitUndoCommands->undoCommit();
- $response .= ' If you pushed the last commit to a remote server you will have to pull from remote before it will allow you to push again.';
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('status-refresh','true');
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_commitlist', array('id' => $this->project->getId())));
- }
-
- /**
- * Action to do a hard undo on the last commit.
- *
- * @Route("/hardcommit/", name="undocommit_hard")
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:Error:request.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function undoHardCommitAction($id, Request $request){
-
- try{
- $response = $this->gitUndoCommands->undoCommitHard();
- $response .= ' If you pushed the last commit to a remote server you will have to pull from remote before it will allow you to push again.';
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('status-refresh','true');
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_commitlist', array('id' => $this->project->getId())));
- }
-
- /**
- * Action to checkout a commit. All files in the working directory will be
- * updated to match the specified commit. This will put the repository
- * in a detached HEAD state. Checking out an old commit is a read-only operation.
- * It’s impossible to harm your repository while viewing an old revision.
- *
- * @Route("/checkoutCommit/{commitHash}", name="project_checkout_commit")
- * @Method("GET")
- * @Template("VersionControlGitControlBundle:Error:request.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function checkoutCommitAction($id,$commitHash){
-
- try{
- $response = $this->gitUndoCommands->checkoutCommit($commitHash);
-
- $this->get('session')->getFlashBag()->add('notice', $response);
- $this->get('session')->getFlashBag()->add('status-refresh','true');
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return $this->redirect($this->generateUrl('project_log', array('id' => $this->project->getId())));
- }
-
- /**
- *
- * @param integer $id Project Id
- */
- public function initAction($id, $grantType = 'VIEW'){
-
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
- return $redirectUrl;
- }
-
- $this->gitUndoCommands = $this->gitCommands->command('undo');
-
- }
-
-}
-
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use VersionControl\GitControlBundle\Annotation\ProjectAccess;
+
+/**
+ * Project controller.
+ *
+ * @Route("/project/{id}/undo")
+ */
+class UndoCommitController extends BaseProjectController
+{
+ protected $gitUndoCommands;
+
+ protected $projectGrantType = 'OPERATOR';
+
+ /**
+ * Action to do a soft undo on the last commit. This will
+ * allow you to fix any messages in the last commit. This
+ * will not effect any files.
+ *
+ * @Route("/softcommit/", name="undocommit_soft")
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:Error:request.html.twig")
+ * @ProjectAccess(grantType="EDIT")
+ */
+ public function undoSoftCommitAction($id, Request $request)
+ {
+ try {
+ $response = $this->gitUndoCommands->undoCommit();
+ $response .= ' If you pushed the last commit to a remote server you will have to pull from remote before it will allow you to push again.';
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_commitlist', array('id' => $this->project->getId())));
+ }
+
+ /**
+ * Action to do a hard undo on the last commit.
+ *
+ * @Route("/hardcommit/", name="undocommit_hard")
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:Error:request.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function undoHardCommitAction($id, Request $request)
+ {
+ try {
+ $response = $this->gitUndoCommands->undoCommitHard();
+ $response .= ' If you pushed the last commit to a remote server you will have to pull from remote before it will allow you to push again.';
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_commitlist', array('id' => $this->project->getId())));
+ }
+
+ /**
+ * Action to checkout a commit. All files in the working directory will be
+ * updated to match the specified commit. This will put the repository
+ * in a detached HEAD state. Checking out an old commit is a read-only operation.
+ * It’s impossible to harm your repository while viewing an old revision.
+ *
+ * @Route("/checkoutCommit/{commitHash}", name="project_checkout_commit")
+ * @Method("GET")
+ * @Template("VersionControlGitControlBundle:Error:request.html.twig")
+ * @ProjectAccess(grantType="MASTER")
+ */
+ public function checkoutCommitAction($id, $commitHash)
+ {
+ try {
+ $response = $this->gitUndoCommands->checkoutCommit($commitHash);
+
+ $this->get('session')->getFlashBag()->add('notice', $response);
+ $this->get('session')->getFlashBag()->add('status-refresh', 'true');
+ } catch (\Exception $e) {
+ $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+ }
+
+ return $this->redirect($this->generateUrl('project_log', array('id' => $this->project->getId())));
+ }
+
+ /**
+ * @param int $id Project Id
+ */
+ public function initAction($id, $grantType = 'VIEW')
+ {
+ $redirectUrl = parent::initAction($id, $grantType);
+ if ($redirectUrl) {
+ return $redirectUrl;
+ }
+
+ $this->gitUndoCommands = $this->gitCommands->command('undo');
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/UserManagementController.php b/app/src/VersionControl/GitControlBundle/Controller/UserManagementController.php
similarity index 79%
rename from src/VersionControl/GitControlBundle/Controller/UserManagementController.php
rename to app/src/VersionControl/GitControlBundle/Controller/UserManagementController.php
index 826496c..fbda5ec 100644
--- a/src/VersionControl/GitControlBundle/Controller/UserManagementController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/UserManagementController.php
@@ -1,200 +1,196 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\RegistrationType;
-use VersionControl\GitControlBundle\Form\EditUserType;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\User\User;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
-/**
- * Project controller.
- * @Method("GET")
- * @Route("/user-managerment")
- * @Security("has_role('ROLE_ADMIN')")
- */
-class UserManagementController extends Controller
-{
-
- /**
- * @Route("/", name="usermanagement")
- * @Template()
- */
- public function listAction()
- {
- $userManager = $this->get('fos_user.user_manager');
- $users = $userManager->findUsers();
-
- return array(
- 'users' => $users,
- );
- }
-
- /**
- * Creates a new Project entity.
- *
- * @Route("/", name="usermanagement_create")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:UserManagement:new.html.twig")
- */
- public function createAction(Request $request)
- {
-
- $userManager = $this->get('fos_user.user_manager');
- $user = $userManager->createUser();
-
- $form = $this->createCreateForm($user);
- $form->handleRequest($request);
-
- if ($form->isValid()) {
- $user->setEnabled('true');
- $userManager->updateUser($user);
-
- $this->get('session')->getFlashBag()->add('notice', 'A new user has been created');
-
- return $this->redirect($this->generateUrl('usermanagement'));
- }
-
- return array(
- 'user' => $user,
- 'form' => $form->createView(),
- );
- }
-
- /**
- * Displays a form to create a new user entity.
- *
- * @Route("/new", name="usermanagement_new")
- * @Method("GET")
- * @Template()
- */
- public function newAction()
- {
- $userManager = $this->get('fos_user.user_manager');
- $user = $userManager->createUser();
- $form = $this->createCreateForm($user);
-
- return array(
- 'user' => $user,
- 'form' => $form->createView(),
- );
- }
-
-
- /**
- * Creates a form to create a User entity.
- *
- * @param User $user The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createCreateForm(User $user)
- {
- $form = $this->createForm(new RegistrationType(), $user, array(
- 'action' => $this->generateUrl('usermanagement_create'),
- 'method' => 'POST',
- ));
-
- $form->add('submit', 'submit', array('label' => 'Create'));
-
- return $form;
- }
-
- /**
- * Displays a form to edit an existing Project entity.
- *
- * @Route("/{id}/edit", name="usermanagement_edit")
- * @Method("GET")
- * @Template()
- */
- public function editAction($id)
- {
- $userManager = $this->get('fos_user.user_manager');
-
- //$em = $this->getDoctrine()->getManager();
- //$user = $em->getRepository('VersionControlGitControlBundle:User/User')->find($id);
-
- //$user = $userManager->find($id);
- $user = $userManager->findUserBy(array('id' => $id));
-
- if (!$user) {
- throw $this->createNotFoundException('Unable to find user entity.');
- }
-
- $editForm = $this->createEditForm($user);
-
- return array(
- 'user' => $user,
- 'edit_form' => $editForm->createView(),
- );
- }
-
- /**
- * Creates a form to edit a Project entity.
- *
- * @param Project $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
- private function createEditForm(User $entity)
- {
- $form = $this->createForm(new EditUserType(), $entity, array(
- 'action' => $this->generateUrl('usermanagement_update', array('id' => $entity->getId())),
- 'method' => 'PUT',
- ));
-
- $form->add('submit', 'submit', array('label' => 'Update'));
-
- return $form;
- }
- /**
- * Edits an existing Project entity.
- *
- * @Route("/{id}", name="usermanagement_update")
- * @Method("PUT")
- * @Template("VersionControlGitControlBundle:UserManagement:edit.html.twig")
- */
- public function updateAction(Request $request, $id)
- {
- $userManager = $this->get('fos_user.user_manager');
-
- $user = $userManager->findUserBy(array('id' => $id));
-
- if (!$user) {
- throw $this->createNotFoundException('Unable to find user entity.');
- }
-
- $editForm = $this->createEditForm($user);
- $editForm->handleRequest($request);
-
- if ($editForm->isValid()) {
- $userManager->updateUser($user);
-
- $this->get('session')->getFlashBag()->add('notice', 'User has been updated');
-
- return $this->redirect($this->generateUrl('usermanagement'));
- }
-
- return array(
- 'user' => $user,
- 'edit_form' => $editForm->createView(),
- );
- }
-}
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use VersionControl\GitControlBundle\Entity\Project;
+use VersionControl\GitControlBundle\Form\RegistrationType;
+use VersionControl\GitControlBundle\Form\EditUserType;
+use VersionControl\GitControlBundle\Entity\User\User;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
+/**
+ * Project controller.
+ *
+ * @Method("GET")
+ * @Route("/user-managerment")
+ * @Security("has_role('ROLE_ADMIN')")
+ */
+class UserManagementController extends Controller
+{
+ /**
+ * @Route("/", name="usermanagement")
+ * @Template()
+ */
+ public function listAction()
+ {
+ $userManager = $this->get('fos_user.user_manager');
+ $users = $userManager->findUsers();
+
+ return array(
+ 'users' => $users,
+ );
+ }
+
+ /**
+ * Creates a new user entity.
+ *
+ * @Route("/", name="usermanagement_create")
+ * @Method("POST")
+ * @Template("VersionControlGitControlBundle:UserManagement:new.html.twig")
+ */
+ public function createAction(Request $request)
+ {
+ $userManager = $this->get('fos_user.user_manager');
+ $user = $userManager->createUser();
+
+ $form = $this->createCreateForm($user);
+ $form->handleRequest($request);
+
+ if ($form->isValid()) {
+ $user->setEnabled('true');
+ $userManager->updateUser($user);
+
+ $this->get('session')->getFlashBag()->add('notice', 'A new user has been created');
+
+ return $this->redirect($this->generateUrl('usermanagement'));
+ }
+
+ return array(
+ 'user' => $user,
+ 'form' => $form->createView(),
+ );
+ }
+
+ /**
+ * Displays a form to create a new user entity.
+ *
+ * @Route("/new", name="usermanagement_new")
+ * @Method("GET")
+ * @Template()
+ */
+ public function newAction()
+ {
+ $userManager = $this->get('fos_user.user_manager');
+ $user = $userManager->createUser();
+ $form = $this->createCreateForm($user);
+
+ return array(
+ 'user' => $user,
+ 'form' => $form->createView(),
+ );
+ }
+
+ /**
+ * Creates a form to create a User entity.
+ *
+ * @param User $user The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createCreateForm(User $user)
+ {
+ $form = $this->createForm(RegistrationType::class, $user, array(
+ 'action' => $this->generateUrl('usermanagement_create'),
+ 'method' => 'POST',
+ ));
+
+ $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+ return $form;
+ }
+
+ /**
+ * Displays a form to edit an existing Project entity.
+ *
+ * @Route("/{id}/edit", name="usermanagement_edit")
+ * @Method("GET")
+ * @Template()
+ */
+ public function editAction($id)
+ {
+ $userManager = $this->get('fos_user.user_manager');
+
+ //$em = $this->getDoctrine()->getManager();
+ //$user = $em->getRepository('VersionControlGitControlBundle:User/User')->find($id);
+
+ //$user = $userManager->find($id);
+ $user = $userManager->findUserBy(array('id' => $id));
+
+ if (!$user) {
+ throw $this->createNotFoundException('Unable to find user entity.');
+ }
+
+ $editForm = $this->createEditForm($user);
+
+ return array(
+ 'user' => $user,
+ 'edit_form' => $editForm->createView(),
+ );
+ }
+
+ /**
+ * Creates a form to edit a Project entity.
+ *
+ * @param Project $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
+ private function createEditForm(User $entity)
+ {
+ $form = $this->createForm(EditUserType::class, $entity, array(
+ 'action' => $this->generateUrl('usermanagement_update', array('id' => $entity->getId())),
+ 'method' => 'PUT',
+ ));
+
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
+
+ return $form;
+ }
+ /**
+ * Edits an existing Project entity.
+ *
+ * @Route("/{id}", name="usermanagement_update")
+ * @Method("PUT")
+ * @Template("VersionControlGitControlBundle:UserManagement:edit.html.twig")
+ */
+ public function updateAction(Request $request, $id)
+ {
+ $userManager = $this->get('fos_user.user_manager');
+
+ $user = $userManager->findUserBy(array('id' => $id));
+
+ if (!$user) {
+ throw $this->createNotFoundException('Unable to find user entity.');
+ }
+
+ $editForm = $this->createEditForm($user);
+ $editForm->handleRequest($request);
+
+ if ($editForm->isValid()) {
+ $userManager->updateUser($user);
+
+ $this->get('session')->getFlashBag()->add('notice', 'User has been updated');
+
+ return $this->redirect($this->generateUrl('usermanagement'));
+ }
+
+ return array(
+ 'user' => $user,
+ 'edit_form' => $editForm->createView(),
+ );
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Controller/UserProjectsController.php b/app/src/VersionControl/GitControlBundle/Controller/UserProjectsController.php
similarity index 75%
rename from src/VersionControl/GitControlBundle/Controller/UserProjectsController.php
rename to app/src/VersionControl/GitControlBundle/Controller/UserProjectsController.php
index 347e5bc..92eef73 100644
--- a/src/VersionControl/GitControlBundle/Controller/UserProjectsController.php
+++ b/app/src/VersionControl/GitControlBundle/Controller/UserProjectsController.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
@@ -17,9 +18,10 @@
use VersionControl\GitControlBundle\Entity\UserProjects;
use VersionControl\GitControlBundle\Entity\Project;
use VersionControl\GitControlBundle\Form\UserProjectsType;
-use VersionControl\GitControlBundle\Form\EditUserProjectsType;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
/**
* UserProjects controller.
@@ -28,7 +30,6 @@
*/
class UserProjectsController extends Controller
{
-
/**
* Lists all UserProjects entities.
*
@@ -45,65 +46,65 @@ public function membersListAction($id)
if (!$project) {
throw $this->createNotFoundException('Unable to find Project entity.');
}
-
+
$this->checkProjectAuthorization($project);
-
+
$userProjects = $em->getRepository('VersionControlGitControlBundle:UserProjects')->findByProject($project);
$userProject = new UserProjects();
$userProject->setProject($project);
- $form = $this->createCreateForm($userProject,$project);
+ $form = $this->createCreateForm($userProject, $project);
$editForm = $this->createEditForm();
-
+
return array(
'userProjects' => $userProjects,
'project' => $project,
'form' => $form->createView(),
- 'edit_form' => $editForm->createView()
+ 'edit_form' => $editForm->createView(),
);
}
-
+
/**
- * Creates a new UserProjects entity.
+ * Adds a user to the project.
*
* @Route("/{id}", name="userprojects_create")
* @Method("POST")
* @Template("VersionControlGitControlBundle:UserProjects:membersList.html.twig")
*/
- public function createAction(Request $request,$id)
+ public function createAction(Request $request, $id)
{
$em = $this->getDoctrine()->getManager();
-
+
$project = $em->getRepository('VersionControlGitControlBundle:Project')->find($id);
if (!$project) {
throw $this->createNotFoundException('Unable to find Project entity.');
}
-
+
$this->checkProjectAuthorization($project);
-
+
$newUserProject = new UserProjects();
- $form = $this->createCreateForm($newUserProject,$project);
+ $form = $this->createCreateForm($newUserProject, $project);
$form->handleRequest($request);
if ($form->isValid()) {
$em->persist($newUserProject);
$em->flush();
-
+
//$this->createACLSettings($newUserProject);
-
+
$this->get('session')->getFlashBag()->add('notice', 'New user has been added to the project');
return $this->redirect($this->generateUrl('members_list', array('id' => $project->getId())));
- }else{
+ } else {
$this->get('session')->getFlashBag()->add('notice', 'Error in adding user to this form');
}
$userProjects = $em->getRepository('VersionControlGitControlBundle:UserProjects')->findByProject($project);
-
+
return array(
'userProjects' => $userProjects,
'project' => $project,
- 'form' => $form->createView()
+ 'form' => $form->createView(),
);
}
@@ -114,48 +115,41 @@ public function createAction(Request $request,$id)
*
* @return \Symfony\Component\Form\Form The form
*/
- private function createCreateForm(UserProjects $entity,$project)
+ private function createCreateForm(UserProjects $entity, $project)
{
- $userProjectsType = new UserProjectsType;
- $form = $this->createForm($userProjectsType->setProjectId($project->getId()), $entity, array(
+ $form = $this->createForm(UserProjectsType::class, $entity, array(
'action' => $this->generateUrl('userprojects_create', array('id' => $project->getId())),
'method' => 'POST',
+ 'projectId' => $project->getId(),
));
- $form->add('submit', 'submit', array('label' => 'Add'));
+ $form->add('submit', SubmitType::class, array('label' => 'Add'));
return $form;
}
-
-
/**
- * Creates a form to edit a UserProjects entity.
- *
- * @param UserProjects $entity The entity
- *
- * @return \Symfony\Component\Form\Form The form
- */
+ * Creates a form to edit a UserProjects entity.
+ *
+ * @param UserProjects $entity The entity
+ *
+ * @return \Symfony\Component\Form\Form The form
+ */
private function createEditForm()
{
-
- $form = $this->createFormBuilder(array(), array(
+ $form = $this->createFormBuilder(array(), array(
'method' => 'POST',
))
- ->add('roles','choice', array(
- 'label' => 'User Role'
- ,'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master')
- ,'required' => false
- ,'empty_value' => 'Please select a role'
- ,'constraints' => array(
- new NotBlank()
- )
+ ->add('roles', ChoiceType::class, array(
+ 'label' => 'User Role', 'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master'), 'required' => false, 'placeholder' => 'Please select a role', 'choices_as_values' => true, 'constraints' => array(
+ new NotBlank(),
+ ),
))
->getForm();
- $form->add('submit', 'submit', array('label' => 'Update'));
+ $form->add('submit', SubmitType::class, array('label' => 'Update'));
+
return $form;
-
}
/**
* Edits an existing UserProjects entity.
@@ -166,7 +160,6 @@ private function createEditForm()
*/
public function updateAction(Request $request, $id)
{
-
$em = $this->getDoctrine()->getManager();
$userProject = $em->getRepository('VersionControlGitControlBundle:UserProjects')->find($id);
@@ -174,7 +167,7 @@ public function updateAction(Request $request, $id)
if (!$userProject) {
throw $this->createNotFoundException('Unable to find UserProjects entity.');
}
-
+
$project = $userProject->getProject();
$this->checkProjectAuthorization($project);
@@ -183,15 +176,14 @@ public function updateAction(Request $request, $id)
if ($roles) {
$userProject->setRoles($roles);
$em->flush();
- $this->get('session')->getFlashBag()->add('notice', 'Users role has been updated');
- }else{
+ $this->get('session')->getFlashBag()->add('notice', 'Users role has been updated');
+ } else {
$this->get('session')->getFlashBag()->add('error', 'Error in adding user to this project');
}
-
+
return $this->redirect($this->generateUrl('members_list', array('id' => $project->getId())));
-
}
-
+
/**
* Deletes a UserProjects entity.
*
@@ -205,28 +197,27 @@ public function deleteAction($id)
throw $this->createNotFoundException('Unable to find UserProjects entity.');
}
$project = $userProject->getProject();
-
+
$this->checkProjectAuthorization($project);
$user = $userProject->getUser();
-
- if($project->getCreator()->getId() === $user->getId()){
- throw new \Exception("You cannot delete a user how is the owner of this project");
+
+ if ($project->getCreator()->getId() === $user->getId()) {
+ throw new \Exception('You cannot delete a user how is the owner of this project');
}
$em->remove($userProject);
$em->flush();
-
- return $this->redirect($this->generateUrl('members_list',array('id'=>$project->getId())));
+ return $this->redirect($this->generateUrl('members_list', array('id' => $project->getId())));
}
-
/**
- *
* @param VersionControl\GitControlBundle\Entity\Project $project
+ *
* @throws AccessDeniedException
*/
- protected function checkProjectAuthorization(\VersionControl\GitControlBundle\Entity\Project $project){
+ protected function checkProjectAuthorization(\VersionControl\GitControlBundle\Entity\Project $project)
+ {
$authorizationChecker = $this->get('security.authorization_checker');
// check for edit access
@@ -234,5 +225,4 @@ protected function checkProjectAuthorization(\VersionControl\GitControlBundle\En
throw new AccessDeniedException();
}
}
-
}
diff --git a/app/src/VersionControl/GitControlBundle/DataFixtures/ORM/LoadProjectData.php b/app/src/VersionControl/GitControlBundle/DataFixtures/ORM/LoadProjectData.php
new file mode 100644
index 0000000..167d539
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/DataFixtures/ORM/LoadProjectData.php
@@ -0,0 +1,97 @@
+container = $container;
+ }
+
+ public function load(ObjectManager $em)
+ {
+ $kernel = $this->container->get('kernel');
+ $this->rootDir = dirname($kernel->getRootDir());
+ //$this->userManager = $this->container->get('fos_user.user_manager');
+
+ if ($kernel->getEnvironment() == 'test') {
+ //Create Test User
+
+ $this->loadTestData($em);
+ }
+ }
+
+ protected function loadTestData(ObjectManager $em)
+ {
+ $user = $this->loadUserData($em, 'test', 'test', 'info@test.com', 'Test Test');
+
+ //Set Creator
+ $project = new Project();
+ $project->setTitle('Test Project');
+ $project->setDescription('Project used for testing only');
+ $project->setCreator($user);
+
+ //Set Access and Roles
+ $userProjectAccess = new UserProjects();
+ $userProjectAccess->setUser($user);
+ $userProjectAccess->setRoles('Owner');
+ $project->addUserProjects($userProjectAccess);
+
+ $em->persist($project);
+ $em->flush();
+
+ $projectEnvironment = new ProjectEnvironment();
+ $projectEnvironment->setProject($project);
+ $projectEnvironment->setTitle('Current Project');
+ $projectEnvironment->setDescription('Test project environment showing this systems git repo');
+ $projectEnvironment->setPath($this->rootDir);
+
+ $em->persist($projectEnvironment);
+ $em->flush();
+ }
+
+ protected function loadUserData(ObjectManager $em, $username, $password, $email, $name)
+ {
+ $userManager = $this->container->get('fos_user.user_manager');
+
+ $user = $userManager->createUser();
+ $user->setUsername($username);
+ $user->setEmail($email);
+ $user->setPlainPassword($password);
+ $user->setName($name);
+
+ $user->setEnabled((bool) true);
+ $user->addRole('ROLE_ADMIN');
+ //$user->setSuperAdmin((Boolean) true);
+
+ $userManager->updateUser($user, true);
+
+ return $user;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/DependencyInjection/Configuration.php b/app/src/VersionControl/GitControlBundle/DependencyInjection/Configuration.php
similarity index 95%
rename from src/VersionControl/GitControlBundle/DependencyInjection/Configuration.php
rename to app/src/VersionControl/GitControlBundle/DependencyInjection/Configuration.php
index 641e655..3902dc5 100644
--- a/src/VersionControl/GitControlBundle/DependencyInjection/Configuration.php
+++ b/app/src/VersionControl/GitControlBundle/DependencyInjection/Configuration.php
@@ -7,21 +7,21 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
/**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
*/
class Configuration implements ConfigurationInterface
{
-
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getConfigTreeBuilder()
{
diff --git a/src/VersionControl/GitControlBundle/DependencyInjection/VersionControlGitControlExtension.php b/app/src/VersionControl/GitControlBundle/DependencyInjection/VersionControlGitControlExtension.php
similarity index 93%
rename from src/VersionControl/GitControlBundle/DependencyInjection/VersionControlGitControlExtension.php
rename to app/src/VersionControl/GitControlBundle/DependencyInjection/VersionControlGitControlExtension.php
index 8cd8fa0..bc90466 100644
--- a/src/VersionControl/GitControlBundle/DependencyInjection/VersionControlGitControlExtension.php
+++ b/app/src/VersionControl/GitControlBundle/DependencyInjection/VersionControlGitControlExtension.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -15,30 +16,28 @@
use Symfony\Component\DependencyInjection\Loader;
/**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
*/
class VersionControlGitControlExtension extends Extension
{
-
-
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function load(array $configs, ContainerBuilder $container)
{
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
- if(isset($config['mapping'])){
+ if (isset($config['mapping'])) {
$container->setParameter('version_control_dynamic_discriminator_map.mapping', $config['mapping']);
- }else{
+ } else {
$container->setParameter('version_control_dynamic_discriminator_map.mapping', array());
}
-
+
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml');
-
+
//$loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
//$loader->load('services.xml');
}
diff --git a/app/src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php b/app/src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php
new file mode 100644
index 0000000..f8542b8
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php
@@ -0,0 +1,92 @@
+
+ */
+class AES256Encryptor implements EncryptorInterface
+{
+ /**
+ * Secret key for aes algorythm.
+ *
+ * @var string
+ */
+ private $secretKey;
+
+ /**
+ * Initialization of encryptor.
+ *
+ * @param string $key
+ */
+ public function __construct($key)
+ {
+ $this->secretKey = $key;
+ }
+
+ /**
+ * Implementation of EncryptorInterface encrypt method.
+ *
+ * @param string $data
+ *
+ * @return string
+ */
+ public function encrypt($data)
+ {
+ if (is_null($data) || trim($data) == '') {
+ return $data;
+ }
+
+ if (defined('PHP_MAJOR_VERSION') && PHP_MAJOR_VERSION >= 7) {
+ $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length("AES-256-ECB"));
+
+ return trim(base64_encode(openssl_encrypt (
+ $data ,
+ "AES-256-ECB",
+ $this->secretKey,
+ 0,
+ $iv)));
+ }else{
+ return trim(base64_encode(mcrypt_encrypt(
+ MCRYPT_RIJNDAEL_256, $this->secretKey, $data, MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND
+ ))));
+ }
+ }
+
+ /**
+ * Implementation of EncryptorInterface decrypt method.
+ *
+ * @param string $data
+ *
+ * @return string
+ */
+ public function decrypt($data)
+ {
+ if (is_null($data) || trim($data) == '') {
+ return $data;
+ }
+
+ if (defined('PHP_MAJOR_VERSION') && PHP_MAJOR_VERSION >= 7) {
+ $iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length("AES-256-ECB"));
+
+ return trim(openssl_decrypt (
+ base64_decode($data) ,
+ "AES-256-ECB",
+ $this->secretKey,
+ 0,
+ $iv));
+ }else{
+ return trim(mcrypt_decrypt(
+ MCRYPT_RIJNDAEL_256, $this->secretKey, base64_decode($data), MCRYPT_MODE_ECB, mcrypt_create_iv(
+ mcrypt_get_iv_size(
+ MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB
+ ), MCRYPT_RAND
+ )));
+ }
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Entity/Commit.php b/app/src/VersionControl/GitControlBundle/Entity/Commit.php
similarity index 60%
rename from src/VersionControl/GitControlBundle/Entity/Commit.php
rename to app/src/VersionControl/GitControlBundle/Entity/Commit.php
index ac9a0b7..f208613 100644
--- a/src/VersionControl/GitControlBundle/Entity/Commit.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Commit.php
@@ -8,151 +8,163 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
use Symfony\Component\Validator\Constraints as Assert;
use VersionControl\GitControlBundle\Validator\Constraints as VersionAssert;
-use VersionControl\GitControlBundle\Entity\Project;
/**
- * A commit entity used to create a from with validation
+ * A commit entity used to create a from with validation.
*
* @author paul schweppe
* @VersionAssert\StatusHash
*/
-class Commit {
-
+class Commit
+{
/**
- *
- * @var string
+ * @var string
* @Assert\NotBlank
*/
- private $comment;
-
+ private $comment;
+
/**
- *
* @var string
- * @Assert\NotBlank
+ * @Assert\NotBlank
*/
private $statusHash;
-
+
/**
- *
- * @var array
+ * @var array
* @Assert\NotBlank
- *
*/
private $files;
-
+
/**
- *
- * @var Project
+ * @var Project
*/
private $project;
-
+
/**
- *
- * @var integer
+ * @var int
*/
private $issue;
-
+
/**
- *
- * @var integer
+ * @var int
*/
private $issueAction;
-
+
/**
- * Flag to state if the system should push after commit
- *
- * @var boolean
+ * Flag to state if the system should push after commit.
+ *
+ * @var bool
*/
private $pushOnCommit;
-
+
/**
- *
- * @var array
+ * @var array
*/
private $pushRemote;
-
- public function __construct() {
+
+ public function __construct()
+ {
$this->pushRemote = array();
}
-
- public function getComment() {
+
+ public function getComment()
+ {
return $this->comment;
}
- public function getStatusHash() {
+ public function getStatusHash()
+ {
return $this->statusHash;
}
- public function getFiles() {
+ public function getFiles()
+ {
return $this->files;
}
- public function getProject() {
+ public function getProject()
+ {
return $this->project;
}
- public function setComment($comment) {
+ public function setComment($comment)
+ {
$this->comment = $comment;
+
return $this;
}
- public function setStatusHash($statusHash) {
+ public function setStatusHash($statusHash)
+ {
$this->statusHash = $statusHash;
+
return $this;
}
- public function setFiles($files) {
+ public function setFiles($files)
+ {
$this->files = $files;
+
return $this;
}
- public function setProject(Project $project) {
+ public function setProject(Project $project)
+ {
$this->project = $project;
+
return $this;
}
- public function getIssue() {
+ public function getIssue()
+ {
return $this->issue;
}
- public function getIssueAction() {
+ public function getIssueAction()
+ {
return $this->issueAction;
}
- public function setIssue($issue) {
+ public function setIssue($issue)
+ {
$this->issue = $issue;
+
return $this;
}
- public function setIssueAction($issueAction) {
+ public function setIssueAction($issueAction)
+ {
$this->issueAction = $issueAction;
+
return $this;
}
- public function getPushOnCommit() {
+ public function getPushOnCommit()
+ {
return $this->pushOnCommit;
}
- public function setPushOnCommit($pushOnCommit) {
+ public function setPushOnCommit($pushOnCommit)
+ {
$this->pushOnCommit = $pushOnCommit;
+
return $this;
}
- public function getPushRemote() {
+ public function getPushRemote()
+ {
return $this->pushRemote;
}
- public function setPushRemote($pushRemote) {
+ public function setPushRemote($pushRemote)
+ {
$this->pushRemote = $pushRemote;
+
return $this;
}
-
-
-
-
}
-
\ No newline at end of file
diff --git a/src/VersionControl/GitControlBundle/Entity/Issue.php b/app/src/VersionControl/GitControlBundle/Entity/Issue.php
similarity index 88%
rename from src/VersionControl/GitControlBundle/Entity/Issue.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issue.php
index 3c99183..5e7933b 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issue.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issue.php
@@ -7,12 +7,14 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use VersionControl\GitControlBundle\Entity\Issues\IssueInterface;
+
/**
- * Issue
+ * Issue.
*
* @ORM\Table(name="issue", indexes={@ORM\Index(name="fk_issue_ver_user1_idx", columns={"ver_user_id"}), @ORM\Index(name="fk_issue_project1_idx", columns={"project_id"}), @ORM\Index(name="fk_issue_issue_milestone1_idx", columns={"issue_milestone_id"})})
* @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\IssueRepository")
@@ -63,14 +65,14 @@ class Issue implements IssueInterface
private $updatedAt;
/**
- * @var integer
+ * @var int
*
* @ORM\Column(name="github_number", type="integer", nullable=true)
*/
private $githubNumber;
/**
- * @var integer
+ * @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
@@ -122,17 +124,18 @@ class Issue implements IssueInterface
* )
*/
private $issueLabel;
-
+
/**
- * Issue comments
+ * Issue comments.
+ *
* @var \Doctrine\Common\Collections\Collection
- *
- * @ORM\OneToMany(targetEntity="VersionControl\GitControlBundle\Entity\IssueComment", mappedBy="issue", fetch="EXTRA_LAZY")
+ *
+ * @ORM\OneToMany(targetEntity="VersionControl\GitControlBundle\Entity\IssueComment", mappedBy="issue", fetch="EXTRA_LAZY")
*/
private $issueComments;
/**
- * Constructor
+ * Constructor.
*/
public function __construct()
{
@@ -142,9 +145,8 @@ public function __construct()
$this->setStatus('open');
}
-
/**
- * Set title
+ * Set title.
*
* @param string $title
*
@@ -158,7 +160,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -168,7 +170,7 @@ public function getTitle()
}
/**
- * Set description
+ * Set description.
*
* @param string $description
*
@@ -177,11 +179,12 @@ public function getTitle()
public function setDescription($description)
{
$this->description = $description;
+
return $this;
}
/**
- * Get description
+ * Get description.
*
* @return string
*/
@@ -191,7 +194,7 @@ public function getDescription()
}
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -205,7 +208,7 @@ public function setStatus($status)
}
/**
- * Get status
+ * Get status.
*
* @return string
*/
@@ -215,7 +218,7 @@ public function getStatus()
}
/**
- * Set closedAt
+ * Set closedAt.
*
* @param \DateTime $closedAt
*
@@ -229,7 +232,7 @@ public function setClosedAt($closedAt)
}
/**
- * Get closedAt
+ * Get closedAt.
*
* @return \DateTime
*/
@@ -239,7 +242,7 @@ public function getClosedAt()
}
/**
- * Set createdAt
+ * Set createdAt.
*
* @param \DateTime $createdAt
*
@@ -253,7 +256,7 @@ public function setCreatedAt($createdAt)
}
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
@@ -263,7 +266,7 @@ public function getCreatedAt()
}
/**
- * Set updatedAt
+ * Set updatedAt.
*
* @param \DateTime $updatedAt
*
@@ -277,7 +280,7 @@ public function setUpdatedAt($updatedAt)
}
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
@@ -287,9 +290,9 @@ public function getUpdatedAt()
}
/**
- * Set githubNumber
+ * Set githubNumber.
*
- * @param integer $githubNumber
+ * @param int $githubNumber
*
* @return Issue
*/
@@ -301,9 +304,9 @@ public function setGithubNumber($githubNumber)
}
/**
- * Get githubNumber
+ * Get githubNumber.
*
- * @return integer
+ * @return int
*/
public function getGithubNumber()
{
@@ -311,9 +314,9 @@ public function getGithubNumber()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
@@ -321,7 +324,7 @@ public function getId()
}
/**
- * Set issueMilestone
+ * Set issueMilestone.
*
* @param \VersionControl\GitControlBundle\Entity\IssueMilestone $issueMilestone
*
@@ -335,7 +338,7 @@ public function setIssueMilestone(\VersionControl\GitControlBundle\Entity\IssueM
}
/**
- * Get issueMilestone
+ * Get issueMilestone.
*
* @return \VersionControl\GitControlBundle\Entity\IssueMilestone
*/
@@ -345,7 +348,7 @@ public function getIssueMilestone()
}
/**
- * Set project
+ * Set project.
*
* @param \VersionControl\GitControlBundle\Entity\Project $project
*
@@ -359,7 +362,7 @@ public function setProject(\VersionControl\GitControlBundle\Entity\Project $proj
}
/**
- * Get project
+ * Get project.
*
* @return \VersionControl\GitControlBundle\Entity\Project
*/
@@ -369,7 +372,7 @@ public function getProject()
}
/**
- * Set verUser
+ * Set verUser.
*
* @param \VersionControl\GitControlBundle\Entity\User\User $verUser
*
@@ -381,9 +384,9 @@ public function setVerUser(\VersionControl\GitControlBundle\Entity\User\User $ve
return $this;
}
-
+
/**
- * Get User
+ * Get User.
*
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface
*/
@@ -393,7 +396,7 @@ public function getUser()
}
/**
- * Get verUser
+ * Get verUser.
*
* @return \VersionControl\GitControlBundle\Entity\User\User
*/
@@ -403,7 +406,7 @@ public function getVerUser()
}
/**
- * Add issueLabel
+ * Add issueLabel.
*
* @param \VersionControl\GitControlBundle\Entity\IssueLabel $issueLabel
*
@@ -417,7 +420,7 @@ public function addIssueLabel(\VersionControl\GitControlBundle\Entity\Issues\Iss
}
/**
- * Remove issueLabel
+ * Remove issueLabel.
*
* @param \VersionControl\GitControlBundle\Entity\IssueLabel $issueLabel
*/
@@ -427,7 +430,7 @@ public function removeIssueLabel(\VersionControl\GitControlBundle\Entity\Issues\
}
/**
- * Get issueLabel
+ * Get issueLabel.
*
* @return \Doctrine\Common\Collections\Collection
*/
@@ -435,41 +438,47 @@ public function getIssueLabel()
{
return $this->issueLabel;
}
-
+
/**
- * Get Issue Comments
+ * Get Issue Comments.
+ *
* @return \Doctrine\Common\Collections\Collection of \VersionControl\GitControlBundle\Entity\IssueComment
*/
- public function getIssueComments() {
+ public function getIssueComments()
+ {
return $this->issueComments;
}
/**
- * Set Issue Comments
+ * Set Issue Comments.
+ *
* @param \Doctrine\Common\Collections\Collection $issueComments
+ *
* @return \VersionControl\GitControlBundle\Entity\Issue
*/
- public function setIssueComments(array $issueComments) {
+ public function setIssueComments(array $issueComments)
+ {
$this->issueComments = $issueComments;
+
return $this;
}
-
/**
* @ORM\PrePersist()
* @ORM\PreUpdate()
*/
- public function updateModifiedDatetime() {
+ public function updateModifiedDatetime()
+ {
// update the modified time
//$this->setCreatedAt(new \DateTime());
$this->setUpdatedAt(new \DateTime());
- if($this->getStatus() === 'closed'){
+ if ($this->getStatus() === 'closed') {
$this->setClosedAt(new \DateTime());
}
}
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -481,9 +490,9 @@ public function setClosed()
return $this;
}
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -495,9 +504,9 @@ public function setOpen()
return $this;
}
-
- public function isClosed(){
- return ($this->status === 'closed')?true:false;
- }
+ public function isClosed()
+ {
+ return ($this->status === 'closed') ? true : false;
+ }
}
diff --git a/src/VersionControl/GitControlBundle/Entity/IssueComment.php b/app/src/VersionControl/GitControlBundle/Entity/IssueComment.php
similarity index 89%
rename from src/VersionControl/GitControlBundle/Entity/IssueComment.php
rename to app/src/VersionControl/GitControlBundle/Entity/IssueComment.php
index e5b3fb6..f6d8bdb 100644
--- a/src/VersionControl/GitControlBundle/Entity/IssueComment.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/IssueComment.php
@@ -7,12 +7,14 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use VersionControl\GitControlBundle\Entity\Issues\IssueCommentInteface;
+
/**
- * IssueComment
+ * IssueComment.
*
* @ORM\Table(name="issue_comment", indexes={@ORM\Index(name="fk_issue_comment_ver_user1_idx", columns={"ver_user_id"})})
* @ORM\Entity
@@ -42,7 +44,7 @@ class IssueComment implements IssueCommentInteface
private $updatedAt;
/**
- * @var integer
+ * @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
@@ -59,7 +61,7 @@ class IssueComment implements IssueCommentInteface
* })
*/
private $verUser;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\Issue
*
@@ -70,14 +72,13 @@ class IssueComment implements IssueCommentInteface
*/
private $issue;
-
-
- public function __construct() {
+ public function __construct()
+ {
$this->setCreatedAt(new \DateTime());
}
/**
- * Set comment
+ * Set comment.
*
* @param string $comment
*
@@ -91,7 +92,7 @@ public function setComment($comment)
}
/**
- * Get comment
+ * Get comment.
*
* @return string
*/
@@ -101,7 +102,7 @@ public function getComment()
}
/**
- * Set createdAt
+ * Set createdAt.
*
* @param \DateTime $createdAt
*
@@ -115,7 +116,7 @@ public function setCreatedAt($createdAt)
}
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
@@ -125,7 +126,7 @@ public function getCreatedAt()
}
/**
- * Set updatedAt
+ * Set updatedAt.
*
* @param \DateTime $updatedAt
*
@@ -139,7 +140,7 @@ public function setUpdatedAt($updatedAt)
}
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
@@ -149,9 +150,9 @@ public function getUpdatedAt()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
@@ -159,7 +160,7 @@ public function getId()
}
/**
- * Set verUser
+ * Set verUser.
*
* @param \VersionControl\GitControlBundle\Entity\User\User $verUser
*
@@ -173,7 +174,7 @@ public function setVerUser(\VersionControl\GitControlBundle\Entity\User\User $ve
}
/**
- * Get verUser
+ * Get verUser.
*
* @return \VersionControl\GitControlBundle\Entity\User\User
*/
@@ -181,9 +182,9 @@ public function getVerUser()
{
return $this->verUser;
}
-
+
/**
- * Get User
+ * Get User.
*
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface
*/
@@ -191,37 +192,39 @@ public function getUser()
{
return $this->verUser;
}
-
+
/**
- * Sets issue
+ * Sets issue.
+ *
* @param \VersionControl\GitControlBundle\Entity\Issue $issue
+ *
* @return \VersionControl\GitControlBundle\Entity\IssueComment
*/
- public function setIssue(\VersionControl\GitControlBundle\Entity\Issues\IssueInterface $issue) {
+ public function setIssue(\VersionControl\GitControlBundle\Entity\Issues\IssueInterface $issue)
+ {
$this->issue = $issue;
+
return $this;
}
-
+
/**
- * Gets issue
+ * Gets issue.
+ *
* @return \VersionControl\GitControlBundle\Entity\Issue
*/
- public function getIssue() {
+ public function getIssue()
+ {
return $this->issue;
}
-
+
/**
* @ORM\PrePersist()
* @ORM\PreUpdate()
*/
- public function updateModifiedDatetime() {
+ public function updateModifiedDatetime()
+ {
// update the modified time
//$this->setCreatedAt(new \DateTime());
$this->setUpdatedAt(new \DateTime());
-
}
-
-
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/IssueLabel.php b/app/src/VersionControl/GitControlBundle/Entity/IssueLabel.php
similarity index 82%
rename from src/VersionControl/GitControlBundle/Entity/IssueLabel.php
rename to app/src/VersionControl/GitControlBundle/Entity/IssueLabel.php
index 4d5e851..29671e1 100644
--- a/src/VersionControl/GitControlBundle/Entity/IssueLabel.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/IssueLabel.php
@@ -7,18 +7,19 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
-use VersionControl\GitControlBundle\Entity\Issues\IssueLabel as BaseIssueLabel;
+use VersionControl\GitControlBundle\Entity\Issues\IssueLabelInterface;
use Doctrine\ORM\Mapping as ORM;
/**
- * IssueLabel
+ * IssueLabel.
*
* @ORM\Table(name="issue_label")
* @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\IssueLabelRepository")
*/
-class IssueLabel extends BaseIssueLabel
+class IssueLabel implements IssueLabelInterface
{
/**
* @var string
@@ -35,7 +36,7 @@ class IssueLabel extends BaseIssueLabel
private $hexColor;
/**
- * @var integer
+ * @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
@@ -49,7 +50,7 @@ class IssueLabel extends BaseIssueLabel
* @ORM\ManyToMany(targetEntity="VersionControl\GitControlBundle\Entity\Issue", mappedBy="issueLabel")
*/
private $issue;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\Project
*
@@ -59,25 +60,25 @@ class IssueLabel extends BaseIssueLabel
* })
*/
private $project;
-
+
/**
- * If set to true its available to all Projects
- * @var boolean
+ * If set to true its available to all Projects.
+ *
+ * @var bool
* @ORM\Column(name="all_projects", type="boolean", nullable=true)
*/
private $allProjects = false;
/**
- * Constructor
+ * Constructor.
*/
public function __construct()
{
$this->issue = new \Doctrine\Common\Collections\ArrayCollection();
}
-
/**
- * Set title
+ * Set title.
*
* @param string $title
*
@@ -91,7 +92,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -101,7 +102,7 @@ public function getTitle()
}
/**
- * Set hexColor
+ * Set hexColor.
*
* @param string $hexColor
*
@@ -115,7 +116,7 @@ public function setHexColor($hexColor)
}
/**
- * Get hexColor
+ * Get hexColor.
*
* @return string
*/
@@ -125,9 +126,9 @@ public function getHexColor()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
@@ -135,7 +136,7 @@ public function getId()
}
/**
- * Add issue
+ * Add issue.
*
* @param \VersionControl\GitControlBundle\Entity\Issue $issue
*
@@ -149,7 +150,7 @@ public function addIssue(\VersionControl\GitControlBundle\Entity\Issues\Issue $i
}
/**
- * Remove issue
+ * Remove issue.
*
* @param \VersionControl\GitControlBundle\Entity\Issue $issue
*/
@@ -159,7 +160,7 @@ public function removeIssue(\VersionControl\GitControlBundle\Entity\Issues\Issue
}
/**
- * Get issue
+ * Get issue.
*
* @return \Doctrine\Common\Collections\Collection
*/
@@ -167,9 +168,19 @@ public function getIssue()
{
return $this->issue;
}
-
- /**
- * Set project
+
+ /**
+ * Get issue.
+ *
+ * @return \Doctrine\Common\Collections\Collection
+ */
+ public function getIssues()
+ {
+ return $this->issue;
+ }
+
+ /**
+ * Set project.
*
* @param \VersionControl\GitControlBundle\Entity\Project $project
*
@@ -183,7 +194,7 @@ public function setProject(\VersionControl\GitControlBundle\Entity\Project $proj
}
/**
- * Get project
+ * Get project.
*
* @return \VersionControl\GitControlBundle\Entity\Project
*/
@@ -191,24 +202,24 @@ public function getProject()
{
return $this->project;
}
-
+
/**
- *
- * @return boolean
+ * @return bool
*/
- public function getAllProjects() {
+ public function getAllProjects()
+ {
return $this->allProjects;
}
/**
- *
- * @param boolean $allProjects
+ * @param bool $allProjects
+ *
* @return \VersionControl\GitControlBundle\Entity\IssueLabel
*/
- public function setAllProjects($allProjects) {
+ public function setAllProjects($allProjects)
+ {
$this->allProjects = $allProjects;
+
return $this;
}
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/IssueMilestone.php b/app/src/VersionControl/GitControlBundle/Entity/IssueMilestone.php
similarity index 90%
rename from src/VersionControl/GitControlBundle/Entity/IssueMilestone.php
rename to app/src/VersionControl/GitControlBundle/Entity/IssueMilestone.php
index 4004b8e..2059d68 100644
--- a/src/VersionControl/GitControlBundle/Entity/IssueMilestone.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/IssueMilestone.php
@@ -7,18 +7,18 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use VersionControl\GitControlBundle\Entity\Issues\IssueMilestoneInterface;
/**
- * IssueMilestone
+ * IssueMilestone.
*
* @ORM\Table(name="issue_milestone", indexes={@ORM\Index(name="fk_issue_milestone_ver_user1_idx", columns={"ver_user_id"})})
* @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\IssueMilestoneRepository")
* @ORM\HasLifecycleCallbacks
- *
*/
class IssueMilestone implements IssueMilestoneInterface
{
@@ -72,7 +72,7 @@ class IssueMilestone implements IssueMilestoneInterface
private $closedAt;
/**
- * @var integer
+ * @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
@@ -89,7 +89,7 @@ class IssueMilestone implements IssueMilestoneInterface
* })
*/
private $verUser;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\Project
*
@@ -100,19 +100,17 @@ class IssueMilestone implements IssueMilestoneInterface
*/
private $project;
-
/**
- * Constructor
+ * Constructor.
*/
public function __construct()
{
$this->setCreatedAt(new \DateTime());
$this->setState('open');
}
-
/**
- * Set title
+ * Set title.
*
* @param string $title
*
@@ -126,7 +124,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -136,7 +134,7 @@ public function getTitle()
}
/**
- * Set description
+ * Set description.
*
* @param string $description
*
@@ -150,7 +148,7 @@ public function setDescription($description)
}
/**
- * Get description
+ * Get description.
*
* @return string
*/
@@ -160,7 +158,7 @@ public function getDescription()
}
/**
- * Set state
+ * Set state.
*
* @param string $state
*
@@ -174,7 +172,7 @@ public function setState($state)
}
/**
- * Get state
+ * Get state.
*
* @return string
*/
@@ -184,7 +182,7 @@ public function getState()
}
/**
- * Set dueOn
+ * Set dueOn.
*
* @param \DateTime $dueOn
*
@@ -198,7 +196,7 @@ public function setDueOn($dueOn)
}
/**
- * Get dueOn
+ * Get dueOn.
*
* @return \DateTime
*/
@@ -208,7 +206,7 @@ public function getDueOn()
}
/**
- * Set createdAt
+ * Set createdAt.
*
* @param \DateTime $createdAt
*
@@ -222,7 +220,7 @@ public function setCreatedAt($createdAt)
}
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
@@ -232,7 +230,7 @@ public function getCreatedAt()
}
/**
- * Set updatedAt
+ * Set updatedAt.
*
* @param \DateTime $updatedAt
*
@@ -246,7 +244,7 @@ public function setUpdatedAt($updatedAt)
}
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
@@ -256,7 +254,7 @@ public function getUpdatedAt()
}
/**
- * Set closedAt
+ * Set closedAt.
*
* @param \DateTime $closedAt
*
@@ -270,7 +268,7 @@ public function setClosedAt($closedAt)
}
/**
- * Get closedAt
+ * Get closedAt.
*
* @return \DateTime
*/
@@ -280,9 +278,9 @@ public function getClosedAt()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
@@ -290,7 +288,7 @@ public function getId()
}
/**
- * Set verUser
+ * Set verUser.
*
* @param \VersionControl\GitControlBundle\Entity\User\User $verUser
*
@@ -304,7 +302,7 @@ public function setVerUser(\VersionControl\GitControlBundle\Entity\User\User $ve
}
/**
- * Get verUser
+ * Get verUser.
*
* @return \VersionControl\GitControlBundle\Entity\User\User
*/
@@ -312,17 +310,17 @@ public function getVerUser()
{
return $this->verUser;
}
-
+
/**
- *
* @return \VersionControl\GitControlBundle\Entity\User\User
*/
- public function getUser(){
+ public function getUser()
+ {
return $this->verUser;
}
-
+
/**
- * Set project
+ * Set project.
*
* @param \VersionControl\GitControlBundle\Entity\Project $project
*
@@ -336,7 +334,7 @@ public function setProject(\VersionControl\GitControlBundle\Entity\Project $proj
}
/**
- * Get project
+ * Get project.
*
* @return \VersionControl\GitControlBundle\Entity\Project
*/
@@ -344,22 +342,23 @@ public function getProject()
{
return $this->project;
}
-
+
/**
* @ORM\PrePersist()
* @ORM\PreUpdate()
*/
- public function updateModifiedDatetime() {
+ public function updateModifiedDatetime()
+ {
// update the modified time
//$this->setCreatedAt(new \DateTime());
$this->setUpdatedAt(new \DateTime());
- if($this->getState() === 'closed'){
+ if ($this->getState() === 'closed') {
$this->setClosedAt(new \DateTime());
}
}
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -371,9 +370,9 @@ public function setClosed()
return $this;
}
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -385,8 +384,9 @@ public function setOpen()
return $this;
}
-
- public function isClosed(){
- return ($this->state === 'closed')?true:false;
+
+ public function isClosed()
+ {
+ return ($this->state === 'closed') ? true : false;
}
}
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/Issue.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/Issue.php
similarity index 85%
rename from src/VersionControl/GitControlBundle/Entity/Issues/Issue.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/Issue.php
index 6535cba..b083fd8 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/Issue.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/Issue.php
@@ -7,81 +7,72 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Entity\Issues;
+namespace VersionControl\GitControlBundle\Entity\Issues;
abstract class Issue
{
/**
* @var string
- *
*/
private $title;
/**
* @var string
- *
*/
private $description;
/**
- * State of issue
- * @var string
+ * State of issue.
*
+ * @var string
*/
private $status;
/**
* @var \DateTime
- *
*/
private $closedAt;
/**
* @var \DateTime
- *
*/
private $createdAt;
/**
* @var \DateTime
- *
*/
private $updatedAt;
/**
- * @var integer
- *
+ * @var int
*/
private $id;
/**
* @var \VersionControl\GitControlBundle\Entity\IssueMilestone
- *
*/
private $issueMilestone;
/**
* @var \VersionControl\GitControlBundle\Entity\Project
- *
*/
private $project;
/**
* @var array
- *
*/
private $issueLabel;
-
+
/**
- * Issue comments
+ * Issue comments.
+ *
* @var array
- *
*/
private $issueComments;
/**
- * Constructor
+ * Constructor.
*/
public function __construct()
{
@@ -91,13 +82,15 @@ public function __construct()
$this->setStatus('open');
}
- public function setId($id) {
+ public function setId($id)
+ {
$this->id = $id;
+
return $this;
}
- /**
- * Set title
+ /**
+ * Set title.
*
* @param string $title
*
@@ -111,7 +104,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -121,7 +114,7 @@ public function getTitle()
}
/**
- * Set description
+ * Set description.
*
* @param string $description
*
@@ -135,7 +128,7 @@ public function setDescription($description)
}
/**
- * Get description
+ * Get description.
*
* @return string
*/
@@ -145,7 +138,7 @@ public function getDescription()
}
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -159,7 +152,7 @@ public function setStatus($status)
}
/**
- * Get status
+ * Get status.
*
* @return string
*/
@@ -169,7 +162,7 @@ public function getStatus()
}
/**
- * Set closedAt
+ * Set closedAt.
*
* @param \DateTime $closedAt
*
@@ -183,7 +176,7 @@ public function setClosedAt($closedAt)
}
/**
- * Get closedAt
+ * Get closedAt.
*
* @return \DateTime
*/
@@ -193,7 +186,7 @@ public function getClosedAt()
}
/**
- * Set createdAt
+ * Set createdAt.
*
* @param \DateTime $createdAt
*
@@ -207,7 +200,7 @@ public function setCreatedAt($createdAt)
}
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
@@ -217,7 +210,7 @@ public function getCreatedAt()
}
/**
- * Set updatedAt
+ * Set updatedAt.
*
* @param \DateTime $updatedAt
*
@@ -231,7 +224,7 @@ public function setUpdatedAt($updatedAt)
}
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
@@ -241,9 +234,9 @@ public function getUpdatedAt()
}
/**
- * Set githubNumber
+ * Set githubNumber.
*
- * @param integer $githubNumber
+ * @param int $githubNumber
*
* @return Issue
*/
@@ -255,9 +248,9 @@ public function setGithubNumber($githubNumber)
}
/**
- * Get githubNumber
+ * Get githubNumber.
*
- * @return integer
+ * @return int
*/
public function getGithubNumber()
{
@@ -265,9 +258,9 @@ public function getGithubNumber()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
@@ -275,7 +268,7 @@ public function getId()
}
/**
- * Set issueMilestone
+ * Set issueMilestone.
*
* @param \VersionControl\GitControlBundle\Entity\IssueMilestone $issueMilestone
*
@@ -289,7 +282,7 @@ public function setIssueMilestone(\VersionControl\GitControlBundle\IssueMileston
}
/**
- * Get issueMilestone
+ * Get issueMilestone.
*
* @return \VersionControl\GitControlBundle\Entity\IssueMilestone
*/
@@ -299,7 +292,7 @@ public function getIssueMilestone()
}
/**
- * Set project
+ * Set project.
*
* @param \VersionControl\GitControlBundle\Entity\Project $project
*
@@ -313,7 +306,7 @@ public function setProject(\VersionControl\GitControlBundle\Entity\Project $proj
}
/**
- * Get project
+ * Get project.
*
* @return \VersionControl\GitControlBundle\Entity\Project
*/
@@ -322,9 +315,8 @@ public function getProject()
return $this->project;
}
-
/**
- * Get User
+ * Get User.
*
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface
*/
@@ -334,7 +326,7 @@ public function getUser()
}
/**
- * Add issueLabel
+ * Add issueLabel.
*
* @param \VersionControl\GitControlBundle\Entity\Issues\IssueLabel $issueLabel
*
@@ -348,7 +340,7 @@ public function addIssueLabel(\VersionControl\GitControlBundle\Entity\Issues\Iss
}
/**
- * Remove issueLabel
+ * Remove issueLabel.
*
* @param \VersionControl\GitControlBundle\Entity\Issues\IssueLabel $issueLabel
*/
@@ -358,7 +350,7 @@ public function removeIssueLabel(\VersionControl\GitControlBundle\Entity\Issues\
}
/**
- * Get issueLabel
+ * Get issueLabel.
*
* @return array
*/
@@ -366,27 +358,33 @@ public function getIssueLabel()
{
return $this->issueLabel;
}
-
+
/**
- * Get Issue Comments
+ * Get Issue Comments.
+ *
* @return array of \VersionControl\GitControlBundle\Entity\Issue\IssueCommentInteface
*/
- public function getIssueComments() {
+ public function getIssueComments()
+ {
return $this->issueComments;
}
/**
- * Set Issue Comments
+ * Set Issue Comments.
+ *
* @param array $issueComments
+ *
* @return \VersionControl\GitControlBundle\Entity\Issue
*/
- public function setIssueComments(array $issueComments) {
+ public function setIssueComments(array $issueComments)
+ {
$this->issueComments = $issueComments;
+
return $this;
}
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -395,11 +393,12 @@ public function setIssueComments(array $issueComments) {
public function setClosed()
{
$this->status = 'closed';
+
return $this;
}
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
@@ -408,13 +407,12 @@ public function setClosed()
public function setOpen()
{
$this->status = 'open';
+
return $this;
}
-
- public function isClosed(){
- return ($this->status === 'closed')?true:false;
- }
+ public function isClosed()
+ {
+ return ($this->status === 'closed') ? true : false;
+ }
}
-
-
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/IssueCommentInteface.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueCommentInteface.php
similarity index 82%
rename from src/VersionControl/GitControlBundle/Entity/Issues/IssueCommentInteface.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/IssueCommentInteface.php
index 3a26ca1..cbdfaa6 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/IssueCommentInteface.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueCommentInteface.php
@@ -7,19 +7,16 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Entity\Issues;
-use Doctrine\ORM\Mapping as ORM;
+namespace VersionControl\GitControlBundle\Entity\Issues;
/**
- * IssueComment
- *
+ * IssueComment.
*/
interface IssueCommentInteface
{
-
/**
- * Set comment
+ * Set comment.
*
* @param string $comment
*
@@ -28,14 +25,14 @@ interface IssueCommentInteface
public function setComment($comment);
/**
- * Get comment
+ * Get comment.
*
* @return string
*/
public function getComment();
/**
- * Set createdAt
+ * Set createdAt.
*
* @param \DateTime $createdAt
*
@@ -44,14 +41,14 @@ public function getComment();
public function setCreatedAt($createdAt);
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
public function getCreatedAt();
/**
- * Set updatedAt
+ * Set updatedAt.
*
* @param \DateTime $updatedAt
*
@@ -60,30 +57,30 @@ public function getCreatedAt();
public function setUpdatedAt($updatedAt);
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
public function getUpdatedAt();
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId();
-
/**
- * Gets issue
+ * Gets issue.
+ *
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueInterface
*/
public function getIssue();
-
+
/**
- * Gets Createor of comment
+ * Gets Createor of comment.
+ *
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface
*/
public function getUser();
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/IssueInterface.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueInterface.php
similarity index 83%
rename from src/VersionControl/GitControlBundle/Entity/Issues/IssueInterface.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/IssueInterface.php
index 808d729..c804e19 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/IssueInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueInterface.php
@@ -7,125 +7,105 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Entity\Issues;
+namespace VersionControl\GitControlBundle\Entity\Issues;
interface IssueInterface
{
-
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId();
/**
- * Get title
+ * Get title.
*
* @return string
*/
public function getTitle();
-
-
/**
- * Get description
+ * Get description.
*
* @return string
*/
public function getDescription();
-
-
/**
- * Get status
+ * Get status.
*
* @return string
*/
public function getStatus();
-
-
/**
- * Get closedAt
+ * Get closedAt.
*
* @return \DateTime
*/
public function getClosedAt();
-
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
public function getCreatedAt();
-
-
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
public function getUpdatedAt();
-
/**
- * Get issueMilestone
+ * Get issueMilestone.
*
* @return \VersionControl\GitControlBundle\Entity\IssueMilestone
*/
public function getIssueMilestone();
-
/**
- * Get User
+ * Get User.
*
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface
*/
public function getUser();
-
-
/**
- * Get issueLabel
+ * Get issueLabel.
*
* @return array of \VersionControl\GitControlBundle\Entity\Issue\IssueLabelInteface
*/
public function getIssueLabel();
-
+
/**
- * Get Issue Comments
+ * Get Issue Comments.
+ *
* @return array of \VersionControl\GitControlBundle\Entity\Issue\IssueCommentInteface
*/
public function getIssueComments();
-
/**
- * Set status
+ * Set status.
*
* @param string $status
*
* @return Issue
*/
public function setClosed();
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
* @return Issue
*/
public function setOpen();
-
- /**
- *
- */
- public function isClosed();
+ public function isClosed();
}
-
-
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabel.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabel.php
similarity index 86%
rename from src/VersionControl/GitControlBundle/Entity/Issues/IssueLabel.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabel.php
index f4458a5..7c4c944 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabel.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabel.php
@@ -7,57 +7,51 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Entity\Issues;
-use Doctrine\ORM\Mapping as ORM;
+namespace VersionControl\GitControlBundle\Entity\Issues;
/**
- * IssueLabel
- *
+ * IssueLabel.
*/
class IssueLabel
{
/**
* @var string
- *
*/
private $title;
/**
* @var string
- *
*/
private $hexColor;
/**
- * @var integer
- *
+ * @var int
*/
private $id;
/**
* @var array
- *
*/
private $issue;
-
/**
- * Constructor
+ * Constructor.
*/
public function __construct()
{
$this->issue = [];
}
-
- public function setId($id) {
+
+ public function setId($id)
+ {
$this->id = $id;
+
return $this;
}
-
/**
- * Set title
+ * Set title.
*
* @param string $title
*
@@ -71,7 +65,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -81,7 +75,7 @@ public function getTitle()
}
/**
- * Set hexColor
+ * Set hexColor.
*
* @param string $hexColor
*
@@ -95,7 +89,7 @@ public function setHexColor($hexColor)
}
/**
- * Get hexColor
+ * Get hexColor.
*
* @return string
*/
@@ -105,9 +99,9 @@ public function getHexColor()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
@@ -115,7 +109,7 @@ public function getId()
}
/**
- * Add issue
+ * Add issue.
*
* @param \VersionControl\GitControlBundle\Entity\Issue $issue
*
@@ -129,7 +123,7 @@ public function addIssue(\VersionControl\GitControlBundle\Entity\Issues\Issue $i
}
/**
- * Remove issue
+ * Remove issue.
*
* @param \VersionControl\GitControlBundle\Entity\Issue $issue
*/
@@ -139,7 +133,7 @@ public function removeIssue(\VersionControl\GitControlBundle\Entity\Issues\Issue
}
/**
- * Get issue
+ * Get issue.
*
* @return \Doctrine\Common\Collections\Collection
*/
@@ -147,8 +141,4 @@ public function getIssue()
{
return $this->issue;
}
-
-
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabelInterface.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabelInterface.php
similarity index 84%
rename from src/VersionControl/GitControlBundle/Entity/Issues/IssueLabelInterface.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabelInterface.php
index 4689f79..fc3409a 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabelInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueLabelInterface.php
@@ -7,47 +7,39 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Entity\Issues;
+namespace VersionControl\GitControlBundle\Entity\Issues;
/**
- * IssueLabel
- *
+ * IssueLabel.
*/
interface IssueLabelInterface
{
-
-
/**
- * Get title
+ * Get title.
*
* @return string
*/
public function getTitle();
/**
- * Get hexColor
+ * Get hexColor.
*
* @return string
*/
public function getHexColor();
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId();
-
/**
- * Get issue
+ * Get issue.
*
* @return array
*/
public function getIssues();
-
-
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/IssueMilestoneInterface.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueMilestoneInterface.php
similarity index 80%
rename from src/VersionControl/GitControlBundle/Entity/Issues/IssueMilestoneInterface.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/IssueMilestoneInterface.php
index 0459d09..9520e1b 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/IssueMilestoneInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueMilestoneInterface.php
@@ -7,114 +7,94 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Entity\Issues;
-use Doctrine\ORM\Mapping as ORM;
+namespace VersionControl\GitControlBundle\Entity\Issues;
/**
- * IssueMilestone
- *
- *
+ * IssueMilestone.
*/
interface IssueMilestoneInterface
{
-
-
-
-
-
/**
- * Get title
+ * Get title.
*
* @return string
*/
public function getTitle();
-
-
/**
- * Get description
+ * Get description.
*
* @return string
*/
public function getDescription();
-
-
/**
- * Get state
+ * Get state.
*
* @return string
*/
public function getState();
-
-
/**
- * Get dueOn
+ * Get dueOn.
*
* @return \DateTime
*/
public function getDueOn();
-
-
/**
- * Get createdAt
+ * Get createdAt.
*
* @return \DateTime
*/
public function getCreatedAt();
-
/**
- * Get updatedAt
+ * Get updatedAt.
*
* @return \DateTime
*/
public function getUpdatedAt();
-
/**
- * Get closedAt
+ * Get closedAt.
*
* @return \DateTime
*/
public function getClosedAt();
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId();
-
/**
- * Get verUser
+ * Get verUser.
*
* @return \VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface
*/
public function getUser();
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
* @return Issue
*/
public function setClosed();
-
+
/**
- * Set status
+ * Set status.
*
* @param string $status
*
* @return Issue
*/
public function setOpen();
-
+
public function isClosed();
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/Issues/IssueUserInterface.php b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueUserInterface.php
similarity index 93%
rename from src/VersionControl/GitControlBundle/Entity/Issues/IssueUserInterface.php
rename to app/src/VersionControl/GitControlBundle/Entity/Issues/IssueUserInterface.php
index a840283..2c4b9bb 100644
--- a/src/VersionControl/GitControlBundle/Entity/Issues/IssueUserInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Issues/IssueUserInterface.php
@@ -7,15 +7,15 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity\Issues;
-/*
+/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
-interface IssueUserInterface{
-
+interface IssueUserInterface
+{
public function getName();
-
-}
\ No newline at end of file
+}
diff --git a/src/VersionControl/GitControlBundle/Entity/Project.php b/app/src/VersionControl/GitControlBundle/Entity/Project.php
similarity index 80%
rename from src/VersionControl/GitControlBundle/Entity/Project.php
rename to app/src/VersionControl/GitControlBundle/Entity/Project.php
index dff9f81..dbd88e8 100644
--- a/src/VersionControl/GitControlBundle/Entity/Project.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/Project.php
@@ -7,7 +7,9 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
+
use Doctrine\ORM\Mapping as ORM;
use VersionControl\DoctrineEncryptBundle\Configuration\Encrypted;
use Symfony\Component\Validator\Constraints as Assert;
@@ -23,14 +25,15 @@ class Project
* @ORM\Id
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
- * @var integer
+ *
+ * @var int
*/
private $id;
-
+
/**
* @var string
* @ORM\Column(name="title", type="string", length=80, nullable=true)
- * @Assert\NotBlank()
+ * @Assert\NotBlank(groups={"New,Edit"})
*/
private $title;
@@ -51,26 +54,26 @@ class Project
* @ORM\Column(name="ssh", type="boolean",nullable=true)
*/
private $ssh;
-
+
/**
* @var string
* @ORM\Column(name="host", type="string", length=225, nullable=true)
*/
private $host;
-
+
/**
* @var string
* @ORM\Column(name="username", type="string", length=225, nullable=true)
*/
private $username;
-
+
/**
* @var string
* @ORM\Column(name="password", type="string", nullable=true)
* @Encrypted
*/
private $password;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\User\User
*
@@ -80,38 +83,30 @@ class Project
* })
*/
private $creator;
-
+
/**
* @var \Doctrine\Common\Collections\Collection
- *
+ *
* @ORM\OneToMany(targetEntity="VersionControl\GitControlBundle\Entity\UserProjects", mappedBy="project", cascade={"persist"}, orphanRemoval=true )
- *
*/
private $userProjects;
-
+
/**
* @var \Doctrine\Common\Collections\Collection
- *
+ *
* @ORM\OneToMany(targetEntity="VersionControl\GitControlBundle\Entity\ProjectEnvironment", mappedBy="project", cascade={"persist"}, orphanRemoval=true )
- * @Assert\Valid
- * @Assert\Count(
- * min = "1",
- * minMessage = "validate.resourceCurriculum.min",
- * groups={"publish"})
+ * @Assert\Valid
+ * @ORM\OrderBy({"position" = "ASC"})
*/
private $projectEnvironment;
-
-
-
- public function __construct()
+ public function __construct()
{
-
$this->userProjects = new \Doctrine\Common\Collections\ArrayCollection();
$this->projectEnvironment = new \Doctrine\Common\Collections\ArrayCollection();
}
/**
- * Set title
+ * Set title.
*
* @param string $title
*
@@ -125,7 +120,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -135,7 +130,7 @@ public function getTitle()
}
/**
- * Set description
+ * Set description.
*
* @param string $description
*
@@ -149,7 +144,7 @@ public function setDescription($description)
}
/**
- * Get description
+ * Get description.
*
* @return string
*/
@@ -159,7 +154,7 @@ public function getDescription()
}
/**
- * Set path
+ * Set path.
*
* @param string $path
*
@@ -173,7 +168,7 @@ public function setPath($path)
}
/**
- * Get path
+ * Get path.
*
* @return string
*/
@@ -183,95 +178,112 @@ public function getPath()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
return $this->id;
}
-
+
/**
- * Get SSH value
- * @return boolean
+ * Get SSH value.
+ *
+ * @return bool
*/
- public function getSsh() {
+ public function getSsh()
+ {
return $this->ssh;
}
-
+
/**
- * Set to use SSH
- * @param boolean $ssh
+ * Set to use SSH.
+ *
+ * @param bool $ssh
*/
- public function setSsh($ssh) {
+ public function setSsh($ssh)
+ {
$this->ssh = $ssh;
}
/**
- * Get SSH host
+ * Get SSH host.
+ *
* @return string
*/
- public function getHost() {
+ public function getHost()
+ {
return $this->host;
}
-
+
/**
- * Set SSH host
+ * Set SSH host.
+ *
* @param string $host
*/
- public function setHost($host) {
+ public function setHost($host)
+ {
$this->host = $host;
}
/**
- * Get SSH username
+ * Get SSH username.
+ *
* @return string
*/
- public function getUsername() {
+ public function getUsername()
+ {
return $this->username;
}
-
+
/**
- * set SSH username
+ * set SSH username.
+ *
* @param type $username
*/
- public function setUsername($username) {
+ public function setUsername($username)
+ {
$this->username = $username;
}
/**
- * Get SSH password
+ * Get SSH password.
+ *
* @return string
*/
- public function getPassword() {
+ public function getPassword()
+ {
return $this->password;
}
/**
- * Set SSH password
+ * Set SSH password.
+ *
* @param string $password
*/
- public function setPassword($password) {
+ public function setPassword($password)
+ {
$this->password = $password;
}
-
+
/**
- * Add user access to project
+ * Add user access to project.
*
* @param \VersionControl\GitControlBundle\Entity\UserProjects $userProject
- * @return Resource
+ *
+ * @return resource
*/
public function addUserProjects(\VersionControl\GitControlBundle\Entity\UserProjects $userProject)
{
$userProject->setProject($this);
$this->userProjects[] = $userProject;
-
+
return $this;
}
/**
- * Remove user access to project
+ * Remove user access to project.
*
* @param \VersionControl\GitControlBundle\Entity\UserProjects $userProject
*/
@@ -279,77 +291,92 @@ public function removeUserProjects(\VersionControl\GitControlBundle\Entity\UserP
{
$this->userProjects->removeElement($userProject);
}
-
+
/**
- * The creator of the project
- * @return \VersionControl\GitControlBundle\Entity\User\User
+ * The creator of the project.
+ *
+ * @return \VersionControl\GitControlBundle\Entity\User\User
*/
- public function getCreator() {
+ public function getCreator()
+ {
return $this->creator;
}
/**
- * Sets the creator of the project
+ * Sets the creator of the project.
+ *
* @param \VersionControl\GitControlBundle\Entity\User\User $creator
+ *
* @return \VersionControl\GitControlBundle\Entity\Project
*/
- public function setCreator(\VersionControl\GitControlBundle\Entity\User\User $creator) {
+ public function setCreator(\VersionControl\GitControlBundle\Entity\User\User $creator)
+ {
$this->creator = $creator;
+
return $this;
}
-
-
/**
- * Get all user access to project
+ * Get all user access to project.
+ *
* @return \Doctrine\Common\Collections\Collection
*/
- public function getUserProjects() {
+ public function getUserProjects()
+ {
return $this->userProjects;
}
/**
- * Set all user access to projects
+ * Set all user access to projects.
+ *
* @param \Doctrine\Common\Collections\Collection $userProjects
*/
- public function setUserProjects(\Doctrine\Common\Collections\Collection $userProjects) {
+ public function setUserProjects(\Doctrine\Common\Collections\Collection $userProjects)
+ {
$this->userProjects = $userProjects;
}
-
+
/**
- * Get array of project enviroments
+ * Get array of project enviroments.
+ *
* @return \Doctrine\Common\Collections\Collection
*/
- public function getProjectEnvironment() {
+ public function getProjectEnvironment()
+ {
return $this->projectEnvironment;
}
/**
- * Set array of project enviroments
+ * Set array of project enviroments.
+ *
* @param \Doctrine\Common\Collections\Collection $projectEnvironment
+ *
* @return \VersionControl\GitControlBundle\Entity\Project
*/
- public function setProjectEnvironment(\Doctrine\Common\Collections\Collection $projectEnvironment) {
+ public function setProjectEnvironment(\Doctrine\Common\Collections\Collection $projectEnvironment)
+ {
$this->projectEnvironment = $projectEnvironment;
+
return $this;
}
-
+
/**
- * Add project environment
+ * Add project environment.
*
* @param \VersionControl\GitControlBundle\Entity\ProjectEnvironment $projectEnvironment
- * @return Resource
+ *
+ * @return resource
*/
public function addProjectEnvironment(\VersionControl\GitControlBundle\Entity\ProjectEnvironment $projectEnvironment)
{
$projectEnvironment->setProject($this);
$this->projectEnvironment[] = $projectEnvironment;
-
+
return $this;
}
/**
- * Remove project environment
+ * Remove project environment.
*
* @param \VersionControl\GitControlBundle\Entity\ProjectEnvironment $projectEnvironment
*/
@@ -357,9 +384,4 @@ public function removeProjectEnvironment(\VersionControl\GitControlBundle\Entity
{
$this->projectEnvironment->removeElement($projectEnvironment);
}
-
-
-
-
}
-
diff --git a/src/VersionControl/GitControlBundle/Entity/ProjectEnvironment.php b/app/src/VersionControl/GitControlBundle/Entity/ProjectEnvironment.php
similarity index 74%
rename from src/VersionControl/GitControlBundle/Entity/ProjectEnvironment.php
rename to app/src/VersionControl/GitControlBundle/Entity/ProjectEnvironment.php
index 81f84a5..0789c77 100644
--- a/src/VersionControl/GitControlBundle/Entity/ProjectEnvironment.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/ProjectEnvironment.php
@@ -7,32 +7,35 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
+
use Doctrine\ORM\Mapping as ORM;
use VersionControl\DoctrineEncryptBundle\Configuration\Encrypted;
use Symfony\Component\Validator\Constraints as Assert;
use VersionControl\GitControlBundle\Validator\Constraints as VersionControlAssert;
-
use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
+use Gedmo\Mapping\Annotation as Gedmo;
/**
* @ORM\Entity
* @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\ProjectEnvironmentRepository")
* @ORM\Table(name="project_environment")
- * @VersionControlAssert\SshDetails
+ * @VersionControlAssert\SshDetails()
* @VersionControlAssert\GitFolderExists(groups={"ExistingGit"})
- * @VersionControlAssert\GitFolderNotExists(groups={"CloneGit","NewGit"})
+ * @VersionControlAssert\GitFolderNotExists(groups={"CloneGit","NewGit"})
*/
-class ProjectEnvironment implements GitEnvironmentInterface
+class ProjectEnvironment implements GitEnvironmentInterface
{
/**
* @ORM\Id
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
- * @var integer
+ *
+ * @var int
*/
private $id;
-
+
/**
* @var string
* @ORM\Column(name="title", type="string", length=80, nullable=true)
@@ -57,50 +60,51 @@ class ProjectEnvironment implements GitEnvironmentInterface
* @ORM\Column(name="ssh", type="boolean",nullable=true)
*/
private $ssh;
-
+
/**
* @var string
* @ORM\Column(name="host", type="string", length=225, nullable=true)
*/
private $host;
-
+
/**
* @var string
* @ORM\Column(name="username", type="string", length=225, nullable=true)
*/
private $username;
-
+
/**
* @var string
* @ORM\Column(name="password", type="string", nullable=true)
* @Encrypted
*/
private $password;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\Project
*
+ * @Gedmo\SortableGroup
* @ORM\ManyToOne(targetEntity="VersionControl\GitControlBundle\Entity\Project", inversedBy="projectEnvironment")
* @ORM\JoinColumns({
* @ORM\JoinColumn(name="project_id", referencedColumnName="id")
* })
*/
private $project;
-
+
/**
* @var string
* @ORM\Column(name="private_key", type="string", nullable=true)
* @Encrypted
*/
private $privateKey = null;
-
+
/**
* @var string
* @ORM\Column(name="private_key_password", type="string", nullable=true)
* @Encrypted
*/
private $privateKeyPassword = null;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\ProjectEnvironmentFilePerm
*
@@ -108,23 +112,30 @@ class ProjectEnvironment implements GitEnvironmentInterface
* @ORM\JoinColumns({
* @ORM\JoinColumn(name="project_environment_file_perm_id", referencedColumnName="id")
* })
+ * @Assert\Valid
*/
private $projectEnvironmentFilePerm;
-
+
/**
* @Assert\NotNull(groups={"CloneGit"}))
- * @var string
+ *
+ * @var string
*/
private $gitCloneLocation;
-
+
+ /**
+ * @Gedmo\SortablePosition
+ *
+ * @ORM\Column(name="position", type="integer")
+ */
+ private $position;
public function __construct()
{
-
}
-
+
/**
- * Set title
+ * Set title.
*
* @param string $title
*
@@ -138,7 +149,7 @@ public function setTitle($title)
}
/**
- * Get title
+ * Get title.
*
* @return string
*/
@@ -148,7 +159,7 @@ public function getTitle()
}
/**
- * Set description
+ * Set description.
*
* @param string $description
*
@@ -162,7 +173,7 @@ public function setDescription($description)
}
/**
- * Get description
+ * Get description.
*
* @return string
*/
@@ -172,7 +183,7 @@ public function getDescription()
}
/**
- * Set path
+ * Set path.
*
* @param string $path
*
@@ -186,7 +197,7 @@ public function setPath($path)
}
/**
- * Get path
+ * Get path.
*
* @return string
*/
@@ -196,83 +207,99 @@ public function getPath()
}
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
return $this->id;
}
-
+
/**
- * Get SSH value
- * @return boolean
+ * Get SSH value.
+ *
+ * @return bool
*/
- public function getSsh() {
- return $this->ssh;
+ public function getSsh(): bool
+ {
+ return $this->ssh ?? false;
}
-
+
/**
- * Set to use SSH
- * @param boolean $ssh
+ * Set to use SSH.
+ *
+ * @param bool $ssh
*/
- public function setSsh($ssh) {
+ public function setSsh(bool $ssh)
+ {
$this->ssh = $ssh;
}
/**
- * Get SSH host
+ * Get SSH host.
+ *
* @return string
*/
- public function getHost() {
+ public function getHost()
+ {
return $this->host;
}
-
+
/**
- * Set SSH host
+ * Set SSH host.
+ *
* @param string $host
*/
- public function setHost($host) {
+ public function setHost($host)
+ {
$this->host = $host;
}
/**
- * Get SSH username
+ * Get SSH username.
+ *
* @return string
*/
- public function getUsername() {
+ public function getUsername()
+ {
return $this->username;
}
-
+
/**
- * set SSH username
+ * set SSH username.
+ *
* @param type $username
*/
- public function setUsername($username) {
+ public function setUsername($username)
+ {
$this->username = $username;
}
/**
- * Get SSH password
+ * Get SSH password.
+ *
* @return string
*/
- public function getPassword() {
+ public function getPassword()
+ {
return $this->password;
}
/**
- * Set SSH password
+ * Set SSH password.
+ *
* @param string $password
*/
- public function setPassword($password) {
+ public function setPassword($password)
+ {
if (!is_null($password)) {
$this->password = $password;
}
}
-
+
/**
- * Set project
+ * Set project.
*
* @param \VersionControl\GitControlBundle\Entity\Project $project
*
@@ -286,7 +313,7 @@ public function setProject(\VersionControl\GitControlBundle\Entity\Project $proj
}
/**
- * Get project
+ * Get project.
*
* @return \VersionControl\GitControlBundle\Entity\Project
*/
@@ -294,81 +321,121 @@ public function getProject()
{
return $this->project;
}
-
- public function getProjectEnvironmentFilePerm() {
+
+ public function getProjectEnvironmentFilePerm()
+ {
return $this->projectEnvironmentFilePerm;
}
- public function setProjectEnvironmentFilePerm(\VersionControl\GitControlBundle\Entity\ProjectEnvironmentFilePerm $projectEnvironmentFilePerm) {
+ public function setProjectEnvironmentFilePerm(\VersionControl\GitControlBundle\Entity\ProjectEnvironmentFilePerm $projectEnvironmentFilePerm)
+ {
$this->projectEnvironmentFilePerm = $projectEnvironmentFilePerm;
+
return $this;
}
/**
- * Sets Git Clone Location
+ * Sets Git Clone Location.
+ *
* @return string
*/
- public function getGitCloneLocation() {
+ public function getGitCloneLocation()
+ {
return $this->gitCloneLocation;
}
/**
- * Gets Git Clone Location
+ * Gets Git Clone Location.
+ *
* @param string $gitCloneLocation
+ *
* @return \VersionControl\GitControlBundle\Entity\ProjectEnvironment
*/
- public function setGitCloneLocation($gitCloneLocation) {
+ public function setGitCloneLocation($gitCloneLocation)
+ {
$this->gitCloneLocation = $gitCloneLocation;
+
return $this;
}
/**
- * Get Private Key
+ * Get Private Key.
+ *
* @return string
*/
- public function getPrivateKey() {
+ public function getPrivateKey()
+ {
return $this->privateKey;
}
/**
- * Get Private Key Password
+ * Get Private Key Password.
+ *
* @return string
*/
- public function getPrivateKeyPassword() {
+ public function getPrivateKeyPassword()
+ {
return $this->privateKeyPassword;
}
/**
- * Set Private Key
+ * Set Private Key.
+ *
* @param string $privateKey
+ *
* @return \VersionControl\GitControlBundle\Entity\ProjectEnvironment
*/
- public function setPrivateKey($privateKey) {
-
+ public function setPrivateKey($privateKey)
+ {
if (!is_null($privateKey)) {
$this->privateKey = $privateKey;
}
+
return $this;
}
/**
- * Set Private Key Password
+ * Set Private Key Password.
+ *
* @param type $privateKeyPassword
+ *
* @return \VersionControl\GitControlBundle\Entity\ProjectEnvironment
*/
- public function setPrivateKeyPassword($privateKeyPassword) {
+ public function setPrivateKeyPassword($privateKeyPassword)
+ {
if (!is_null($privateKeyPassword)) {
$this->privateKeyPassword = $privateKeyPassword;
}
+
return $this;
}
-
- public function getPort() {
+
+ public function getPort()
+ {
return 22;
}
+ /**
+ * Set position.
+ *
+ * @param int $position
+ *
+ * @return ThreadPage
+ */
+ public function setPosition($position)
+ {
+ $this->position = $position;
-
+ return $this;
+ }
+ /**
+ * Get position.
+ *
+ * @return int
+ */
+ public function getPosition()
+ {
+ return $this->position;
+ }
}
-
diff --git a/src/VersionControl/GitControlBundle/Entity/ProjectEnvironmentFilePerm.php b/app/src/VersionControl/GitControlBundle/Entity/ProjectEnvironmentFilePerm.php
similarity index 73%
rename from src/VersionControl/GitControlBundle/Entity/ProjectEnvironmentFilePerm.php
rename to app/src/VersionControl/GitControlBundle/Entity/ProjectEnvironmentFilePerm.php
index 9d126fd..892b5dd 100644
--- a/src/VersionControl/GitControlBundle/Entity/ProjectEnvironmentFilePerm.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/ProjectEnvironmentFilePerm.php
@@ -7,340 +7,384 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
+
use Doctrine\ORM\Mapping as ORM;
-use VersionControl\DoctrineEncryptBundle\Configuration\Encrypted;
-use Symfony\Component\Validator\Constraints as Assert;
-use VersionControl\GitControlBundle\Validator\Constraints as VersionControlAssert;
/**
* @ORM\Entity
* @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\ProjectEnvironmentFilePermRepository")
* @ORM\Table(name="project_environment_file_perm")
*/
-class ProjectEnvironmentFilePerm{
-
+class ProjectEnvironmentFilePerm
+{
/**
* @ORM\Id
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
- * @var integer
+ *
+ * @var int
*/
private $id;
-
+
/**
* @var string
* @ORM\Column(name="file_owner", type="string", length=80, nullable=true)
*/
private $fileOwner;
-
+
/**
* @var string
* @ORM\Column(name="file_group", type="string", length=80, nullable=true)
*/
private $fileGroup;
-
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="enable_file_permissions", type="boolean", nullable=true)
*/
private $enableFilePermissions;
-
+
/**
* @var ProjectEnvironment
- *
+ *
* @ORM\OneToOne(targetEntity="VersionControl\GitControlBundle\Entity\ProjectEnvironment", mappedBy="projectEnvironmentFilePerm" )
*/
private $projectEnvironment;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_owner_read", type="boolean", nullable=true)
*/
private $permissionOwnerRead;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_owner_write", type="boolean", nullable=true)
*/
private $permissionOwnerWrite;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_owner_execute", type="boolean", nullable=true)
*/
private $permissionOwnerExecute;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_sticky_uid", type="boolean", nullable=true)
*/
private $permissionStickyUid;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_group_read", type="boolean", nullable=true)
*/
private $permissionGroupRead;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_group_write", type="boolean", nullable=true)
*/
private $permissionGroupWrite;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_group_execute", type="boolean", nullable=true)
*/
private $permissionGroupExecute;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_sticky_gid", type="boolean", nullable=true)
*/
private $permissionStickyGid;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_other_read", type="boolean", nullable=true)
*/
private $permissionOtherRead;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_other_write", type="boolean", nullable=true)
*/
private $permissionOtherWrite;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_other_execute", type="boolean", nullable=true)
*/
private $permissionOtherExecute;
-
+
/**
- * @var boolean
+ * @var bool
* @ORM\Column(name="permission_sticky_bit", type="boolean", nullable=true)
*/
private $permissionStickyBit;
-
+
/**
- * Get id
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
return $this->id;
}
-
+
/**
- *
* @return string
*/
- public function getFileOwner() {
+ public function getFileOwner()
+ {
return $this->fileOwner;
}
- public function getFileGroup() {
+ public function getFileGroup()
+ {
return $this->fileGroup;
}
- public function getPermissionOwner() {
+ public function getPermissionOwner()
+ {
return $this->permissionOwner;
}
- public function getPermissionGroup() {
+ public function getPermissionGroup()
+ {
return $this->permissionGroup;
}
- public function getPermissionOther() {
+ public function getPermissionOther()
+ {
return $this->permissionOther;
}
-
- public function getPermissionSticky() {
+
+ public function getPermissionSticky()
+ {
return $this->permissionSticky;
}
-
- public function getEnableFilePermissions() {
+ public function getEnableFilePermissions()
+ {
return $this->enableFilePermissions;
}
- public function getProjectEnvironment() {
+ public function getProjectEnvironment()
+ {
return $this->projectEnvironment;
}
- public function setFileOwner($fileOwner) {
+ public function setFileOwner($fileOwner)
+ {
$this->fileOwner = $fileOwner;
+
return $this;
}
- public function setFileGroup($fileGroup) {
+ public function setFileGroup($fileGroup)
+ {
$this->fileGroup = $fileGroup;
+
return $this;
}
-
-
- public function setEnableFilePermissions($enableFilePermissions) {
+ public function setEnableFilePermissions($enableFilePermissions)
+ {
$this->enableFilePermissions = $enableFilePermissions;
+
return $this;
}
- public function setProjectEnvironment(ProjectEnvironment $projectEnvironment) {
+ public function setProjectEnvironment(ProjectEnvironment $projectEnvironment)
+ {
$this->projectEnvironment = $projectEnvironment;
+
return $this;
}
-
- public function getPermissionOwnerRead() {
+
+ public function getPermissionOwnerRead()
+ {
return $this->permissionOwnerRead;
}
- public function getPermissionOwnerWrite() {
+ public function getPermissionOwnerWrite()
+ {
return $this->permissionOwnerWrite;
}
- public function getPermissionOwnerExecute() {
+ public function getPermissionOwnerExecute()
+ {
return $this->permissionOwnerExecute;
}
- public function setPermissionOwnerRead($permissionOwnerRead) {
+ public function setPermissionOwnerRead($permissionOwnerRead)
+ {
$this->permissionOwnerRead = $permissionOwnerRead;
+
return $this;
}
- public function setPermissionOwnerWrite($permissionOwnerWrite) {
+ public function setPermissionOwnerWrite($permissionOwnerWrite)
+ {
$this->permissionOwnerWrite = $permissionOwnerWrite;
+
return $this;
}
- public function setPermissionOwnerExecute($permissionOwnerExecute) {
+ public function setPermissionOwnerExecute($permissionOwnerExecute)
+ {
$this->permissionOwnerExecute = $permissionOwnerExecute;
+
return $this;
}
-
- public function getPermissionStickyUid() {
+
+ public function getPermissionStickyUid()
+ {
return $this->permissionStickyUid;
}
- public function setPermissionStickyUid($permissionStickyUid) {
+ public function setPermissionStickyUid($permissionStickyUid)
+ {
$this->permissionStickyUid = $permissionStickyUid;
+
return $this;
}
-
- public function getPermissionGroupRead() {
+
+ public function getPermissionGroupRead()
+ {
return $this->permissionGroupRead;
}
- public function getPermissionGroupWrite() {
+ public function getPermissionGroupWrite()
+ {
return $this->permissionGroupWrite;
}
- public function getPermissionGroupExecute() {
+ public function getPermissionGroupExecute()
+ {
return $this->permissionGroupExecute;
}
- public function getPermissionStickyGid() {
+ public function getPermissionStickyGid()
+ {
return $this->permissionStickyGid;
}
- public function getPermissionOtherRead() {
+ public function getPermissionOtherRead()
+ {
return $this->permissionOtherRead;
}
- public function getPermissionOtherWrite() {
+ public function getPermissionOtherWrite()
+ {
return $this->permissionOtherWrite;
}
- public function getPermissionOtherExecute() {
+ public function getPermissionOtherExecute()
+ {
return $this->permissionOtherExecute;
}
- public function getPermissionStickyBit() {
+ public function getPermissionStickyBit()
+ {
return $this->permissionStickyBit;
}
- public function setPermissionGroupRead($permissionGroupRead) {
+ public function setPermissionGroupRead($permissionGroupRead)
+ {
$this->permissionGroupRead = $permissionGroupRead;
+
return $this;
}
- public function setPermissionGroupWrite($permissionGroupWrite) {
+ public function setPermissionGroupWrite($permissionGroupWrite)
+ {
$this->permissionGroupWrite = $permissionGroupWrite;
+
return $this;
}
- public function setPermissionGroupExecute($permissionGroupExecute) {
+ public function setPermissionGroupExecute($permissionGroupExecute)
+ {
$this->permissionGroupExecute = $permissionGroupExecute;
+
return $this;
}
- public function setPermissionStickyGid($permissionStickyGid) {
+ public function setPermissionStickyGid($permissionStickyGid)
+ {
$this->permissionStickyGid = $permissionStickyGid;
+
return $this;
}
- public function setPermissionOtherRead($permissionOtherRead) {
+ public function setPermissionOtherRead($permissionOtherRead)
+ {
$this->permissionOtherRead = $permissionOtherRead;
+
return $this;
}
- public function setPermissionOtherWrite($permissionOtherWrite) {
+ public function setPermissionOtherWrite($permissionOtherWrite)
+ {
$this->permissionOtherWrite = $permissionOtherWrite;
+
return $this;
}
- public function setPermissionOtherExecute($permissionOtherExecute) {
+ public function setPermissionOtherExecute($permissionOtherExecute)
+ {
$this->permissionOtherExecute = $permissionOtherExecute;
+
return $this;
}
- public function setPermissionStickyBit($permissionStickyBit) {
+ public function setPermissionStickyBit($permissionStickyBit)
+ {
$this->permissionStickyBit = $permissionStickyBit;
+
return $this;
}
-
- public function setFileMode($fileMode){
+
+ public function setFileMode($fileMode)
+ {
//Does nothing
return $this;
}
-
- public function getFileMode(){
- $types = array('Owner','Group','Other');
+ public function getFileMode()
+ {
+ $types = array('Owner', 'Group', 'Other');
$mode = array();
-
+
$mode['sticky'] = 0;
- if($this->getPermissionStickyUid()){
+ if ($this->getPermissionStickyUid()) {
$mode['sticky'] += 4;
}
- if($this->getPermissionStickyGid()){
+ if ($this->getPermissionStickyGid()) {
$mode['sticky'] += 2;
}
- if($this->getPermissionStickyBit()){
+ if ($this->getPermissionStickyBit()) {
$mode['sticky'] += 1;
- }
-
- foreach($types as $type){
+ }
+
+ foreach ($types as $type) {
$mode[$type] = 0;
- if(call_user_func(array($this, "getPermission".$type."Read"))){
+ if (call_user_func(array($this, 'getPermission'.$type.'Read'))) {
$mode[$type] += 4;
}
- if(call_user_func(array($this, "getPermission".$type."Write"))){
+ if (call_user_func(array($this, 'getPermission'.$type.'Write'))) {
$mode[$type] += 2;
}
- if(call_user_func(array($this, "getPermission".$type."Execute"))){
+ if (call_user_func(array($this, 'getPermission'.$type.'Execute'))) {
$mode[$type] += 1;
}
}
-
- return implode('',$mode);
- }
-
-
-
+ return implode('', $mode);
+ }
}
diff --git a/src/VersionControl/GitControlBundle/Entity/ProjectIssueIntegrator.php b/app/src/VersionControl/GitControlBundle/Entity/ProjectIssueIntegrator.php
similarity index 82%
rename from src/VersionControl/GitControlBundle/Entity/ProjectIssueIntegrator.php
rename to app/src/VersionControl/GitControlBundle/Entity/ProjectIssueIntegrator.php
index b568255..a3e32be 100644
--- a/src/VersionControl/GitControlBundle/Entity/ProjectIssueIntegrator.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/ProjectIssueIntegrator.php
@@ -7,18 +7,19 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
/**
- * Project Issue Integrator Entity
- *
+ * Project Issue Integrator Entity.
+ *
*
* @ORM\Table(name="project_issue_integrator", indexes={@ORM\Index(name="fk_project_issue_integrator_project1", columns={"project_id"})})
* @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\ProjectIssueIntegratorRepository")
* @ORM\HasLifecycleCallbacks
- *
+ *
* @ORM\InheritanceType("JOINED")
* @ORM\DiscriminatorColumn(name="class_name", type="string")
* @ORM\DiscriminatorMap({
@@ -26,25 +27,24 @@
* "Gitlab" = "VersionControl\GitlabIssueBundle\Entity\ProjectIssueIntegratorGitlab"
* })
*/
-abstract class ProjectIssueIntegrator {
-
+abstract class ProjectIssueIntegrator
+{
/**
- * @var integer
+ * @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="IDENTITY")
*/
private $id;
-
-
+
/**
* @var string
*
* @ORM\Column(name="repo_type", type="string", length=80, nullable=true)
*/
private $repoType;
-
+
/**
* @var \VersionControl\GitControlBundle\Entity\Project
*
@@ -54,55 +54,55 @@ abstract class ProjectIssueIntegrator {
* })
*/
private $project;
-
+
/**
- * Constructor
+ * Constructor.
*/
public function __construct()
{
}
-
- /**
- * Get id
+
+ /**
+ * Get id.
*
- * @return integer
+ * @return int
*/
public function getId()
{
return $this->id;
}
-
/**
- * Type of repo eg github,gitlab,gitbucket(JIRA)
+ * Type of repo eg github,gitlab,gitbucket(JIRA).
+ *
* @return string
*/
- public function getRepoType() {
+ public function getRepoType()
+ {
return $this->repoType;
}
/**
- * Project
+ * Project.
+ *
* @return \VersionControl\GitControlBundle\Entity\Project
*/
- public function getProject() {
+ public function getProject()
+ {
return $this->project;
}
-
- public function setRepoType($repoType) {
+ public function setRepoType($repoType)
+ {
$this->repoType = $repoType;
+
return $this;
}
- public function setProject(\VersionControl\GitControlBundle\Entity\Project $project) {
+ public function setProject(\VersionControl\GitControlBundle\Entity\Project $project)
+ {
$this->project = $project;
+
return $this;
}
-
-
-
-
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Entity/User/User.php b/app/src/VersionControl/GitControlBundle/Entity/User/User.php
similarity index 76%
rename from src/VersionControl/GitControlBundle/Entity/User/User.php
rename to app/src/VersionControl/GitControlBundle/Entity/User/User.php
index 28fb694..bd99847 100644
--- a/src/VersionControl/GitControlBundle/Entity/User/User.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/User/User.php
@@ -1,157 +1,166 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Entity\User;
-
-use FOS\UserBundle\Model\User as BaseUser;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
-use VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="ver_user")
- */
-class User extends BaseUser implements IssueUserInterface
-{
- /**
- * @ORM\Id
- * @ORM\Column(type="integer")
- * @ORM\GeneratedValue(strategy="AUTO")
- */
- protected $id;
-
- /**
- *
- * @var string
- * @ORM\Column(name="name", type="string", length=255, nullable=true)
- * @Assert\NotBlank(message="Please enter your name.", groups={"Registration", "Profile"})
- * @Assert\Length(
- * min=3,
- * max=255,
- * minMessage="The name is too short.",
- * maxMessage="The name is too long.",
- * groups={"Registration", "Profile"}
- * )
- */
- protected $name;
-
- /**
- * @var \Doctrine\Common\Collections\Collection
- *
- * @ORM\OneToMany(targetEntity="VersionControl\GitControlBundle\Entity\UserProjects", mappedBy="user", cascade={"persist"} )
- *
- */
- private $userProjects;
-
- /**
- * Is admin Base on roles eg ROLE_ADMIN
- * @var boolean
- */
- private $admin;
-
- /**
- * @ORM\Column(name="github_id", type="string", length=255, nullable=true)
- */
- protected $githubId;
-
- /** @ORM\Column(name="github_access_token", type="string", length=255, nullable=true) */
- protected $githubAccessToken;
-
-
- public function __construct()
- {
- parent::__construct();
- // your own logic
- $this->userProjects = new \Doctrine\Common\Collections\ArrayCollection();
- }
-
- public function getName() {
- return $this->name;
- }
-
- public function setName($name) {
- $this->name = $name;
- }
-
- /**
- * Add user access to project
- *
- * @param \VersionControl\GitControlBundle\Entity\UserProjects $userProject
- * @return Resource
- */
- public function addUserProjects(\VersionControl\GitControlBundle\Entity\UserProjects $userProject)
- {
- $userProject->setUser($this);
- $this->userProjects[] = $userProject;
-
- return $this;
- }
-
- /**
- * Remove user access to project
- *
- * @param \VersionControl\GitControlBundle\Entity\UserProjects $userProject
- */
- public function removeUserProjects(\VersionControl\GitControlBundle\Entity\UserProjects $userProject)
- {
- $this->userProjects->removeElement($userProject);
- }
-
-
- /**
- * Get all user access to project
- * @return \Doctrine\Common\Collections\Collection
- */
- public function getUserProjects() {
- return $this->userProjects;
- }
-
- /**
- * Set all user access to projects
- * @param \Doctrine\Common\Collections\Collection $userProjects
- */
- public function setUserProjects(\Doctrine\Common\Collections\Collection $userProjects) {
- $this->userProjects = $userProjects;
- }
-
- public function getAdmin() {
-
- return $this->hasRole('ROLE_ADMIN');
- }
-
- public function setAdmin($admin) {
- $this->admin = $admin;
- $this->setRoles(array('ROLE_ADMIN'));
- return $this;
- }
-
- public function getGithubId() {
- return $this->githubId;
- }
-
- public function getGithubAccessToken() {
- return $this->githubAccessToken;
- }
-
- public function setGithubId($githubId) {
- $this->githubId = $githubId;
- return $this;
- }
-
- public function setGithubAccessToken($githubAccessToken) {
- $this->githubAccessToken = $githubAccessToken;
- return $this;
- }
-
-
-
-}
-
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Entity\User;
+
+use FOS\UserBundle\Model\User as BaseUser;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+use VersionControl\GitControlBundle\Entity\Issues\IssueUserInterface;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="ver_user")
+ */
+class User extends BaseUser implements IssueUserInterface
+{
+ /**
+ * @ORM\Id
+ * @ORM\Column(type="integer")
+ * @ORM\GeneratedValue(strategy="AUTO")
+ */
+ protected $id;
+
+ /**
+ * @var string
+ * @ORM\Column(name="name", type="string", length=255, nullable=true)
+ * @Assert\NotBlank(message="Please enter your name.", groups={"Registration", "Profile"})
+ * @Assert\Length(
+ * min=3,
+ * max=255,
+ * minMessage="The name is too short.",
+ * maxMessage="The name is too long.",
+ * groups={"Registration", "Profile"}
+ * )
+ */
+ protected $name;
+
+ /**
+ * @var \Doctrine\Common\Collections\Collection
+ *
+ * @ORM\OneToMany(targetEntity="VersionControl\GitControlBundle\Entity\UserProjects", mappedBy="user", cascade={"persist"} )
+ */
+ private $userProjects;
+
+ /**
+ * Is admin Base on roles eg ROLE_ADMIN.
+ *
+ * @var bool
+ */
+ private $admin;
+
+ /**
+ * @ORM\Column(name="github_id", type="string", length=255, nullable=true)
+ */
+ protected $githubId;
+
+ /** @ORM\Column(name="github_access_token", type="string", length=255, nullable=true) */
+ protected $githubAccessToken;
+
+ public function __construct()
+ {
+ parent::__construct();
+ // your own logic
+ $this->userProjects = new \Doctrine\Common\Collections\ArrayCollection();
+ }
+
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ public function setName($name)
+ {
+ $this->name = $name;
+ }
+
+ /**
+ * Add user access to project.
+ *
+ * @param \VersionControl\GitControlBundle\Entity\UserProjects $userProject
+ *
+ * @return resource
+ */
+ public function addUserProjects(\VersionControl\GitControlBundle\Entity\UserProjects $userProject)
+ {
+ $userProject->setUser($this);
+ $this->userProjects[] = $userProject;
+
+ return $this;
+ }
+
+ /**
+ * Remove user access to project.
+ *
+ * @param \VersionControl\GitControlBundle\Entity\UserProjects $userProject
+ */
+ public function removeUserProjects(\VersionControl\GitControlBundle\Entity\UserProjects $userProject)
+ {
+ $this->userProjects->removeElement($userProject);
+ }
+
+ /**
+ * Get all user access to project.
+ *
+ * @return \Doctrine\Common\Collections\Collection
+ */
+ public function getUserProjects()
+ {
+ return $this->userProjects;
+ }
+
+ /**
+ * Set all user access to projects.
+ *
+ * @param \Doctrine\Common\Collections\Collection $userProjects
+ */
+ public function setUserProjects(\Doctrine\Common\Collections\Collection $userProjects)
+ {
+ $this->userProjects = $userProjects;
+ }
+
+ public function getAdmin()
+ {
+ return $this->hasRole('ROLE_ADMIN');
+ }
+
+ public function setAdmin($admin)
+ {
+ $this->admin = $admin;
+ $this->setRoles(array('ROLE_ADMIN'));
+
+ return $this;
+ }
+
+ public function getGithubId()
+ {
+ return $this->githubId;
+ }
+
+ public function getGithubAccessToken()
+ {
+ return $this->githubAccessToken;
+ }
+
+ public function setGithubId($githubId)
+ {
+ $this->githubId = $githubId;
+
+ return $this;
+ }
+
+ public function setGithubAccessToken($githubAccessToken)
+ {
+ $this->githubAccessToken = $githubAccessToken;
+
+ return $this;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Entity/UserProjects.php b/app/src/VersionControl/GitControlBundle/Entity/UserProjects.php
similarity index 83%
rename from src/VersionControl/GitControlBundle/Entity/UserProjects.php
rename to app/src/VersionControl/GitControlBundle/Entity/UserProjects.php
index 99630cd..7cba122 100644
--- a/src/VersionControl/GitControlBundle/Entity/UserProjects.php
+++ b/app/src/VersionControl/GitControlBundle/Entity/UserProjects.php
@@ -1,93 +1,102 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Entity;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\UserProjectsRepository")
- * @ORM\Table(name="user_projects")
- */
-class UserProjects
-{
- /**
- * @ORM\Id
- * @ORM\Column(type="integer")
- * @ORM\GeneratedValue(strategy="AUTO")
- * @var integer
- */
- private $id;
-
- /**
- * @var string
- * @ORM\Column(name="roles", type="string", length=225, nullable=true)
- */
- private $roles;
-
- /**
- * @var \VersionControl\GitControlBundle\Entity\Project
- *
- * @ORM\ManyToOne(targetEntity="VersionControl\GitControlBundle\Entity\Project", inversedBy="userProjects")
- * @ORM\JoinColumns({
- * @ORM\JoinColumn(name="project_id", referencedColumnName="id")
- * })
- */
- private $project;
-
- /**
- * @var \VersionControl\GitControlBundle\Entity\User\User
- *
- * @ORM\ManyToOne(targetEntity="VersionControl\GitControlBundle\Entity\User\User", inversedBy="userProjects")
- * @ORM\JoinColumns({
- * @ORM\JoinColumn(name="ver_user_id", referencedColumnName="id")
- * })
- */
- private $user;
-
- /**
- * Entity Id
- * @return type
- */
- public function getId() {
- return $this->id;
- }
-
- public function getRoles() {
- return $this->roles;
- }
-
- public function setRoles($roles) {
- $this->roles = $roles;
- return $this;
- }
-
- public function getProject() {
- return $this->project;
- }
-
- public function setProject(\VersionControl\GitControlBundle\Entity\Project $project) {
- $this->project = $project;
- return $this;
- }
-
- public function getUser() {
- return $this->user;
- }
-
- public function setUser(\VersionControl\GitControlBundle\Entity\User\User $user) {
- $this->user = $user;
- return $this;
- }
-
-
-
-
-}
-
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Entity(repositoryClass="VersionControl\GitControlBundle\Repository\UserProjectsRepository")
+ * @ORM\Table(name="user_projects")
+ */
+class UserProjects
+{
+ /**
+ * @ORM\Id
+ * @ORM\Column(type="integer")
+ * @ORM\GeneratedValue(strategy="AUTO")
+ *
+ * @var int
+ */
+ private $id;
+
+ /**
+ * @var string
+ * @ORM\Column(name="roles", type="string", length=225, nullable=true)
+ */
+ private $roles;
+
+ /**
+ * @var \VersionControl\GitControlBundle\Entity\Project
+ *
+ * @ORM\ManyToOne(targetEntity="VersionControl\GitControlBundle\Entity\Project", inversedBy="userProjects")
+ * @ORM\JoinColumns({
+ * @ORM\JoinColumn(name="project_id", referencedColumnName="id")
+ * })
+ */
+ private $project;
+
+ /**
+ * @var \VersionControl\GitControlBundle\Entity\User\User
+ *
+ * @ORM\ManyToOne(targetEntity="VersionControl\GitControlBundle\Entity\User\User", inversedBy="userProjects")
+ * @ORM\JoinColumns({
+ * @ORM\JoinColumn(name="ver_user_id", referencedColumnName="id")
+ * })
+ */
+ private $user;
+
+ /**
+ * Entity Id.
+ *
+ * @return type
+ */
+ public function getId()
+ {
+ return $this->id;
+ }
+
+ public function getRoles()
+ {
+ return $this->roles;
+ }
+
+ public function setRoles($roles)
+ {
+ $this->roles = $roles;
+
+ return $this;
+ }
+
+ public function getProject()
+ {
+ return $this->project;
+ }
+
+ public function setProject(\VersionControl\GitControlBundle\Entity\Project $project)
+ {
+ $this->project = $project;
+
+ return $this;
+ }
+
+ public function getUser()
+ {
+ return $this->user;
+ }
+
+ public function setUser(\VersionControl\GitControlBundle\Entity\User\User $user)
+ {
+ $this->user = $user;
+
+ return $this;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/EventListener/DoctrineEventListener.php b/app/src/VersionControl/GitControlBundle/EventListener/DoctrineEventListener.php
similarity index 94%
rename from src/VersionControl/GitControlBundle/EventListener/DoctrineEventListener.php
rename to app/src/VersionControl/GitControlBundle/EventListener/DoctrineEventListener.php
index 1b49424..c11d573 100644
--- a/src/VersionControl/GitControlBundle/EventListener/DoctrineEventListener.php
+++ b/app/src/VersionControl/GitControlBundle/EventListener/DoctrineEventListener.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\EventListener;
use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
@@ -33,10 +34,10 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event)
$class = new \ReflectionClass($metadata->getName());
}
- if(count($this->mapping) > 0){
+ if (count($this->mapping) > 0) {
foreach ($this->mapping as $entityName => $map) {
if ($class->getName() == $map['entity']) {
- $reader = new AnnotationReader;
+ $reader = new AnnotationReader();
$discriminatorMap = array();
if (null !== $discriminatorMapAnnotation = $reader->getClassAnnotation($class, 'Doctrine\ORM\Mapping\DiscriminatorMap')) {
@@ -51,4 +52,4 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event)
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/VersionControl/GitControlBundle/EventListener/GitAlterFilesEventListener.php b/app/src/VersionControl/GitControlBundle/EventListener/GitAlterFilesEventListener.php
new file mode 100644
index 0000000..7a08735
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/EventListener/GitAlterFilesEventListener.php
@@ -0,0 +1,66 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\EventListener;
+
+use Exception;
+use VersionControl\GitCommandBundle\Event\GitAlterFilesEvent;
+use VersionControl\GitCommandBundle\GitCommands\Command\GitFilesCommand;
+use VersionControl\GitCommandBundle\GitCommands\GitCommand;
+use VersionControl\GitControlBundle\Entity\ProjectEnvironment;
+
+class GitAlterFilesEventListener
+{
+ /**
+ * @var GitFilesCommand
+ */
+ protected $gitCommand;
+
+ public function __construct(GitCommand $gitCommand)
+ {
+ $this->gitCommand = $gitCommand;
+ }
+
+ public function changeFilePermissions(GitAlterFilesEvent $event): void
+ {
+ $projectEnvironment = $event->getGitEnvironment();
+ if (!$projectEnvironment instanceof ProjectEnvironment) {
+ throw new Exception('Git Environment must be a entity of project Environment');
+ }
+ $projectEnvironmentFilePerm = $projectEnvironment->getProjectEnvironmentFilePerm();
+ if ($projectEnvironmentFilePerm !== null) {
+ if ($projectEnvironmentFilePerm->getEnableFilePermissions()) {
+ $gitFilesCommand = $this->gitCommand->command('files');
+ $gitFilesCommand->overRideGitEnvironment($projectEnvironment);
+
+ $branch = $this->gitCommand->command('branch')->getCurrentBranch();
+
+ $files = array();
+ if (count($event->getFilesAltered()) > 0) {
+ $files = $event->getFilesAltered();
+ } else {
+ $fileInfos = $gitFilesCommand->listFiles('', $branch, true);
+
+ foreach ($fileInfos as $fileInfo) {
+ $files[] = $fileInfo->getFullPath();
+ }
+ }
+
+ $gitFilesCommand->setFilesPermissions($files, $projectEnvironmentFilePerm->getFileMode());
+
+ $gitFilesCommand->setFilesOwnerAndGroup(
+ $files,
+ $projectEnvironmentFilePerm->getFileOwner(),
+ $projectEnvironmentFilePerm->getFileGroup()
+ );
+ }
+ }
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/EventListener/ProjectAccessControlList.php b/app/src/VersionControl/GitControlBundle/EventListener/ProjectAccessControlList.php
similarity index 81%
rename from src/VersionControl/GitControlBundle/EventListener/ProjectAccessControlList.php
rename to app/src/VersionControl/GitControlBundle/EventListener/ProjectAccessControlList.php
index 69b20d2..08197fb 100644
--- a/src/VersionControl/GitControlBundle/EventListener/ProjectAccessControlList.php
+++ b/app/src/VersionControl/GitControlBundle/EventListener/ProjectAccessControlList.php
@@ -1,172 +1,166 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\EventListener;
-
-use Doctrine\ORM\Event\LifecycleEventArgs;
-use Doctrine\Common\EventSubscriber;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-use VersionControl\GitControlBundle\Entity\Project;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
-use Symfony\Component\Security\Acl\Permission\MaskBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-class ProjectAccessControlList implements EventSubscriber{
-
- /**
- *
- * @var Symfony\Component\Security\Acl\Model\AclProviderInterface
- */
- private $container;
-
- public function __construct(ContainerInterface $container) {
- $this->container = $container;
- }
-
- public function getSubscribedEvents()
- {
- return array(
- 'postPersist',
- 'postUpdate',
- 'preRemove'
- );
- }
-
- public function postPersist(LifecycleEventArgs $args)
- {
- $entity = $args->getEntity();
- //$entityManager = $args->getEntityManager();
-
- // If entity is userproject then update ACL based on roles
- if ($entity instanceof UserProjects) {
-
- $this->createACLSettings($entity);
- }
- }
-
- public function postUpdate(LifecycleEventArgs $args)
- {
- $entity = $args->getEntity();
- //$entityManager = $args->getEntityManager();
-
- // If entity is userproject then update ACL based on roles
- if ($entity instanceof UserProjects) {
-
- $this->createACLSettings($entity);
- }
- }
-
- public function preRemove(LifecycleEventArgs $args)
- {
- $entity = $args->getEntity();
-
- // Deletes Acl settings for Project if it is deleted
- if ($entity instanceof Project) {
- $this->deleteACLSettingsForProject($entity);
- }
- }
-
- /**
- * Sets the Access Control Level for the user for this project
- *
- * @param UserProjects $userProject
- * @throws AccessDeniedException
- */
- protected function createACLSettings(UserProjects $userProject){
- // creating the ACL
- $user = $userProject->getUser();
- $project = $userProject->getProject();
-
- $aclProvider = $this->container->get('security.acl.provider');
- $objectIdentity = ObjectIdentity::fromDomainObject($project);
- // retrieving the security identity of the currently logged-in user
- $securityIdentity = UserSecurityIdentity::fromAccount($user);
-
- try {
- $acl = $aclProvider->findAcl($objectIdentity);
-
- //Delete any Exisitng acls for this users. Only the Username seems to work
- $aces = $acl->getObjectAces();
- foreach($aces as $i => $ace) {
- if ($ace->getSecurityIdentity()->equals($securityIdentity)) {
- //if($ace->getSecurityIdentity()->getUsername() == $user->getUsername()){
- // Got it! Let's remove it!
- $acl->deleteObjectAce($i);
-
- }
- }
- } catch (\Symfony\Component\Security\Acl\Exception\AclNotFoundException $e) {
- $acl = $aclProvider->createAcl($objectIdentity);
- }
-
-
-
-
-
- // grant owner access
- if($userProject->getRoles() == 'Reporter'){
- $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_VIEW);
- }else if($userProject->getRoles() == 'Developer'){
- $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_OPERATOR);
- }else if($userProject->getRoles() == 'Master'){
- $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_MASTER);
- }else if($userProject->getRoles() == 'Owner'){
- $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_OWNER);
- }else{
- throw new AccessDeniedException("User Role is not valid");
- }
- $aclProvider->updateAcl($acl);
- }
-
- /**
- * Deletes all ACL settings for a project entity.
- * @param Project $project
- */
- protected function deleteACLSettingsForProject(Project $project){
-
- $aclProvider = $this->container->get('security.acl.provider');
- $objectIdentity = ObjectIdentity::fromDomainObject($project);
- $aclProvider->deleteAcl($objectIdentity);
-
- }
-
- /**
- * Deletes all ACL settings for a user.
- * @param type $user
- * @todo: Figure out how to do this
- */
- protected function deleteACLSettingsForUser( $user){
-
- $aclProvider = $this->container->get('security.acl.provider');
- $securityIdentity = UserSecurityIdentity::fromAccount($user);
-
- //Get all projects
- $userProjects = $user->getUserProjects();
- foreach($userProjects as $userProject){
- $objectIdentity = ObjectIdentity::fromDomainObject($userProject->getProject());
- try {
- $acl = $aclProvider->findAcl($objectIdentity);
-
- //Delete any Exisitng acls for this users. Only the Username seems to work
- $aces = $acl->getObjectAces();
- foreach($aces as $i => $ace) {
- if ($ace->getSecurityIdentity()->equals($securityIdentity)) {
- $acl->deleteObjectAce($i);
- }
- }
- } catch (\Symfony\Component\Security\Acl\Exception\AclNotFoundException $e) {
-
- }
- }
- }
-
-}
-
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\EventListener;
+
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\Common\EventSubscriber;
+use VersionControl\GitControlBundle\Entity\UserProjects;
+use VersionControl\GitControlBundle\Entity\Project;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
+use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
+use Symfony\Component\Security\Acl\Permission\MaskBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ProjectAccessControlList implements EventSubscriber
+{
+ /**
+ * @var Symfony\Component\Security\Acl\Model\AclProviderInterface
+ */
+ private $container;
+
+ public function __construct(ContainerInterface $container)
+ {
+ $this->container = $container;
+ }
+
+ public function getSubscribedEvents()
+ {
+ return array(
+ 'postPersist',
+ 'postUpdate',
+ 'preRemove',
+ );
+ }
+
+ public function postPersist(LifecycleEventArgs $args)
+ {
+ $entity = $args->getEntity();
+ //$entityManager = $args->getEntityManager();
+
+ // If entity is userproject then update ACL based on roles
+ if ($entity instanceof UserProjects) {
+ $this->createACLSettings($entity);
+ }
+ }
+
+ public function postUpdate(LifecycleEventArgs $args)
+ {
+ $entity = $args->getEntity();
+ //$entityManager = $args->getEntityManager();
+
+ // If entity is userproject then update ACL based on roles
+ if ($entity instanceof UserProjects) {
+ $this->createACLSettings($entity);
+ }
+ }
+
+ public function preRemove(LifecycleEventArgs $args)
+ {
+ $entity = $args->getEntity();
+
+ // Deletes Acl settings for Project if it is deleted
+ if ($entity instanceof Project) {
+ $this->deleteACLSettingsForProject($entity);
+ }
+ }
+
+ /**
+ * Sets the Access Control Level for the user for this project.
+ *
+ * @param UserProjects $userProject
+ *
+ * @throws AccessDeniedException
+ */
+ protected function createACLSettings(UserProjects $userProject)
+ {
+ // creating the ACL
+ $user = $userProject->getUser();
+ $project = $userProject->getProject();
+
+ $aclProvider = $this->container->get('security.acl.provider');
+ $objectIdentity = ObjectIdentity::fromDomainObject($project);
+ // retrieving the security identity of the currently logged-in user
+ $securityIdentity = UserSecurityIdentity::fromAccount($user);
+
+ try {
+ $acl = $aclProvider->findAcl($objectIdentity);
+
+ //Delete any Exisitng acls for this users. Only the Username seems to work
+ $aces = $acl->getObjectAces();
+ foreach ($aces as $i => $ace) {
+ if ($ace->getSecurityIdentity()->equals($securityIdentity)) {
+ //if($ace->getSecurityIdentity()->getUsername() == $user->getUsername()){
+ // Got it! Let's remove it!
+ $acl->deleteObjectAce($i);
+ }
+ }
+ } catch (\Symfony\Component\Security\Acl\Exception\AclNotFoundException $e) {
+ $acl = $aclProvider->createAcl($objectIdentity);
+ }
+
+ // grant owner access
+ if ($userProject->getRoles() == 'Reporter') {
+ $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_VIEW);
+ } elseif ($userProject->getRoles() == 'Developer') {
+ $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_OPERATOR);
+ } elseif ($userProject->getRoles() == 'Master') {
+ $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_MASTER);
+ } elseif ($userProject->getRoles() == 'Owner') {
+ $acl->insertObjectAce($securityIdentity, MaskBuilder::MASK_OWNER);
+ } else {
+ throw new AccessDeniedException('User Role is not valid');
+ }
+ $aclProvider->updateAcl($acl);
+ }
+
+ /**
+ * Deletes all ACL settings for a project entity.
+ *
+ * @param Project $project
+ */
+ protected function deleteACLSettingsForProject(Project $project)
+ {
+ $aclProvider = $this->container->get('security.acl.provider');
+ $objectIdentity = ObjectIdentity::fromDomainObject($project);
+ $aclProvider->deleteAcl($objectIdentity);
+ }
+
+ /**
+ * Deletes all ACL settings for a user.
+ *
+ * @param type $user
+ * @todo: Figure out how to do this
+ */
+ protected function deleteACLSettingsForUser($user)
+ {
+ $aclProvider = $this->container->get('security.acl.provider');
+ $securityIdentity = UserSecurityIdentity::fromAccount($user);
+
+ //Get all projects
+ $userProjects = $user->getUserProjects();
+ foreach ($userProjects as $userProject) {
+ $objectIdentity = ObjectIdentity::fromDomainObject($userProject->getProject());
+ try {
+ $acl = $aclProvider->findAcl($objectIdentity);
+
+ //Delete any Exisitng acls for this users. Only the Username seems to work
+ $aces = $acl->getObjectAces();
+ foreach ($aces as $i => $ace) {
+ if ($ace->getSecurityIdentity()->equals($securityIdentity)) {
+ $acl->deleteObjectAce($i);
+ }
+ }
+ } catch (\Symfony\Component\Security\Acl\Exception\AclNotFoundException $e) {
+ }
+ }
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/EventListener/ProjectEnviromentBeforeListener.php b/app/src/VersionControl/GitControlBundle/EventListener/ProjectEnviromentBeforeListener.php
similarity index 52%
rename from src/VersionControl/GitControlBundle/EventListener/ProjectEnviromentBeforeListener.php
rename to app/src/VersionControl/GitControlBundle/EventListener/ProjectEnviromentBeforeListener.php
index 4935684..a3653e8 100644
--- a/src/VersionControl/GitControlBundle/EventListener/ProjectEnviromentBeforeListener.php
+++ b/app/src/VersionControl/GitControlBundle/EventListener/ProjectEnviromentBeforeListener.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\EventListener;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -16,39 +17,37 @@
class ProjectEnviromentBeforeListener
{
- /**
+ /**
* @var ProjectEnvironmentStorage
*/
protected $projectEnvironmentStorage;
-
+
/**
- *
* @param \VersionControl\GitControlBundle\Controller\ProjectController\ProjectEnvironmentStorage $projectEnvironmentStorage
*/
public function __construct(ProjectEnvironmentStorage $projectEnvironmentStorage)
{
- $this->projectEnvironmentStorage = $projectEnvironmentStorage;
+ $this->projectEnvironmentStorage = $projectEnvironmentStorage;
}
-
- public function onKernelController(FilterControllerEvent $event)
- {
- $controller = $event->getController();
- if (!is_array($controller)) {
- // not a object but a different kind of callable. Do nothing
+
+ public function onKernelController(FilterControllerEvent $event)
+ {
+ $controller = $event->getController();
+ if (!is_array($controller)) {
+ // not a object but a different kind of callable. Do nothing
return;
- }
+ }
+
+ $controllerObject = $controller[0];
+ if ($controllerObject instanceof ProjectController || $controllerObject instanceof BaseProjectController) {
+ $params = $event->getRequest()->attributes->get('_route_params');
- $controllerObject = $controller[0];
- if ($controllerObject instanceof ProjectController || $controllerObject instanceof BaseProjectController) {
-
- $params = $event->getRequest()->attributes->get('_route_params');
-
- if($event->getRequest()->query->get('projenv') && key_exists('id', $params)){
- $projectEnvironmentId = intval($event->getRequest()->query->get('projenv'));
- $projectId = intval($params['id']);
-
- $this->projectEnvironmentStorage->setProjectEnvironment($projectId, $projectEnvironmentId);
- }
+ if ($event->getRequest()->query->get('projenv') && key_exists('id', $params)) {
+ $projectEnvironmentId = intval($event->getRequest()->query->get('projenv'));
+ $projectId = intval($params['id']);
+
+ $this->projectEnvironmentStorage->setProjectEnvironment($projectId, $projectEnvironmentId);
}
- }
+ }
+ }
}
diff --git a/src/VersionControl/GitControlBundle/Form/CommitType.php b/app/src/VersionControl/GitControlBundle/Form/CommitType.php
similarity index 57%
rename from src/VersionControl/GitControlBundle/Form/CommitType.php
rename to app/src/VersionControl/GitControlBundle/Form/CommitType.php
index 3500399..ca80f1d 100644
--- a/src/VersionControl/GitControlBundle/Form/CommitType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/CommitType.php
@@ -1,158 +1,151 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-
-class CommitType extends AbstractType
-{
- protected $fileChoices = array();
-
- protected $includeIssues;
-
- protected $gitRemoteVersions;
-
-
-
- /**
- * @param FormBuilderInterface $builder
- * @param array $options
- */
- public function buildForm(FormBuilderInterface $builder, array $options)
- {
- $this->includeIssues = $options['includeIssues'];
- $this->gitRemoteVersions = $options['gitRemoteVersions'];
- $this->fileChoices = $options['fileChoices'];
-
- $builder
- ->add('comment', TextareaType::class, array(
- 'label' => 'Comment'
- ,'required' => false
- //,'constraints' => array(
- // new NotBlank(array('message'=>'Please add a commit comment.'))
- //)
- ))
- ->add('statushash', 'hidden', array(
- //'data' => $this->gitCommands->getStatusHash(),
- //'constraints' => array(
- //new NotBlank()
- //)
- ));
- if(count($this->getFileChoices()) > 0){
- $builder->add('files', ChoiceType::class, array(
- 'choices' => $this->getFileChoices(),
- //'class' => '\VersionControl\GitControlBundle\Entity\GitFile',
- 'multiple' => true,
- 'expanded' => true,
- 'required' => false,
- 'choices_as_values' => true,
- 'choice_label' => function($gitFile) {
- return $gitFile->getPath1();
- },
- 'choice_value' => function($gitFile) {
- return $gitFile->getPath1();
- },
- //'constraints' => array(
- // new NotBlank()
- // ,new \VersionControl\GitControlBundle\Validator\Constraints\StatusHash()
- //)
- ));
- }else{
- $builder->add('files',CheckboxType::class, array(
- 'label' => 'Commit all files',
- 'required' => false,
- ));
- }
-
-
- if($this->includeIssues === true){
- $builder->add('issue', HiddenType::class)
- ->add('issueAction',ChoiceType::class, [
- 'choices' => [
- 'Close Issue' => [
- 'Fixed Issue' => 'Fixed',
- 'Closed Issue' => 'Closed',
- 'Resolved Issue' => 'Resolved',
- ],
- 'Related to Issue' => [
- 'Reference Issue' => 'Reference',
- 'See Issue' => 'See'
- ]
- ],
- 'choices_as_values' => true
- ]
- );
- }
-
- if(is_array($this->gitRemoteVersions) && count($this->gitRemoteVersions) > 0){
- $remoteChoices = array();
- foreach($this->gitRemoteVersions as $remoteVersion){
- $remoteChoices[$remoteVersion[0]] = $remoteVersion[0].'('.$remoteVersion[1].')';
- }
- $builder->add('pushRemote',ChoiceType::class, [
- 'choices' => $remoteChoices,
- 'multiple' => true,
- 'expanded' => true,
- 'required' => false,
- 'choices_as_values' => false,
- 'label' => 'Push changes immediately to:'
-
- ]);
-
- }
- }
-
- /**
- * @param OptionsResolverInterface $resolver
- */
- public function setDefaultOptions(OptionsResolverInterface $resolver)
- {
- $resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\Commit',
- 'includeIssues' => false,
- 'gitRemoteVersions' => array(),
- 'fileChoices' => array(),
- ));
- }
-
-
-
- /**
- * @return string
- */
- public function getName()
- {
- return 'versioncontrol_gitcontrolbundle_commit';
- }
-
- public function getFileChoices() {
-
- if(count($this->fileChoices) > 200){
- return array();
- }
-
- return $this->fileChoices;
- }
-
- public function setFileChoices($fileChoices) {
- $this->fileChoices = $fileChoices;
- return $this;
- }
-
-
-}
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use VersionControl\GitControlBundle\Entity\Commit;
+
+class CommitType extends AbstractType
+{
+ protected $fileChoices = array();
+
+ protected $includeIssues;
+
+ protected $gitRemoteVersions;
+
+ /**
+ * @param FormBuilderInterface $builder
+ * @param array $options
+ */
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $this->includeIssues = $options['includeIssues'];
+ $this->gitRemoteVersions = $options['gitRemoteVersions'];
+ $this->fileChoices = $options['fileChoices'];
+
+ $builder
+ ->add('comment', TextareaType::class, array(
+ 'label' => 'Comment', 'required' => false,
+ //,'constraints' => array(
+ // new NotBlank(array('message'=>'Please add a commit comment.'))
+ //)
+ ))
+ ->add('statushash', HiddenType::class, array(
+ //'data' => $this->gitCommands->getStatusHash(),
+ //'constraints' => array(
+ //new NotBlank()
+ //)
+ ));
+ if (count($this->getFileChoices()) > 0) {
+ $builder->add('files', ChoiceType::class, array(
+ 'choices' => $this->getFileChoices(),
+ //'class' => '\VersionControl\GitControlBundle\Entity\GitFile',
+ 'multiple' => true,
+ 'expanded' => true,
+ 'required' => false,
+ 'choices_as_values' => true,
+ 'choice_label' => function ($gitFile) {
+ return $gitFile->getPath1();
+ },
+ 'choice_value' => function ($gitFile) {
+ return $gitFile->getPath1();
+ },
+ //'constraints' => array(
+ // new NotBlank()
+ // ,new \VersionControl\GitControlBundle\Validator\Constraints\StatusHash()
+ //)
+ ));
+ } else {
+ $builder->add('files', CheckboxType::class, array(
+ 'label' => 'Commit all files',
+ 'required' => false,
+ ));
+ }
+
+ if ($this->includeIssues === true) {
+ $builder->add('issue', HiddenType::class)
+ ->add('issueAction', ChoiceType::class, [
+ 'choices' => [
+ 'Close Issue' => [
+ 'Fixed Issue' => 'Fixed',
+ 'Closed Issue' => 'Closed',
+ 'Resolved Issue' => 'Resolved',
+ ],
+ 'Related to Issue' => [
+ 'Reference Issue' => 'Reference',
+ 'See Issue' => 'See',
+ ],
+ ],
+ 'choices_as_values' => true,
+ ]
+ );
+ }
+
+ if (is_array($this->gitRemoteVersions) && count($this->gitRemoteVersions) > 0) {
+ $remoteChoices = array();
+ foreach ($this->gitRemoteVersions as $remoteVersion) {
+ $remoteChoices[$remoteVersion[0].'('.$remoteVersion[1].')'] = $remoteVersion[0];
+ }
+ $builder->add('pushRemote', ChoiceType::class, [
+ 'choices' => $remoteChoices,
+ 'multiple' => true,
+ 'expanded' => true,
+ 'required' => false,
+ 'choices_as_values' => true,
+ 'label' => 'Push changes immediately to:',
+
+ ]);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->setDefaults(array(
+ 'data_class' => Commit::class,
+ 'includeIssues' => false,
+ 'gitRemoteVersions' => array(),
+ 'fileChoices' => array(),
+ ));
+ }
+
+ /**
+ * @return string
+ */
+ public function getBlockPrefix()
+ {
+ return 'versioncontrol_gitcontrolbundle_commit';
+ }
+
+ public function getFileChoices()
+ {
+ if (count($this->fileChoices) > 200) {
+ return array();
+ }
+
+ return $this->fileChoices;
+ }
+
+ public function setFileChoices($fileChoices)
+ {
+ $this->fileChoices = $fileChoices;
+
+ return $this;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php b/app/src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php
similarity index 98%
rename from src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php
rename to app/src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php
index eb70bfa..7f133ca 100644
--- a/src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php
+++ b/app/src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
@@ -23,21 +24,22 @@ class EntityToIdTransformer implements DataTransformerInterface
* @var string
*/
protected $class;
-
+
public function __construct(ObjectManager $objectManager, $class)
{
$this->objectManager = $objectManager;
$this->class = $class;
}
-
+
public function transform($entity)
{
if (null === $entity) {
return;
}
+
return $entity->getId();
}
-
+
public function reverseTransform($id)
{
if (!$id) {
@@ -49,8 +51,7 @@ public function reverseTransform($id)
if (null === $entity) {
throw new TransformationFailedException();
}
+
return $entity;
}
-
}
-
diff --git a/src/VersionControl/GitControlBundle/Form/EditUserProjectsType.php b/app/src/VersionControl/GitControlBundle/Form/EditUserProjectsType.php
similarity index 67%
rename from src/VersionControl/GitControlBundle/Form/EditUserProjectsType.php
rename to app/src/VersionControl/GitControlBundle/Form/EditUserProjectsType.php
index 3f7decd..f19bbd6 100644
--- a/src/VersionControl/GitControlBundle/Form/EditUserProjectsType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/EditUserProjectsType.php
@@ -7,57 +7,48 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Doctrine\ORM\EntityRepository;
-
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class EditUserProjectsType extends AbstractType
{
-
-
-
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
-
$builder
- ->add('roles',ChoiceType::class, array(
- 'label' => 'User Role'
- ,'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master')
- ,'required' => false
- ,'empty_value' => 'Please select a role'
+ ->add('roles', ChoiceType::class, array(
+ 'label' => 'User Role', 'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master'), 'required' => false, 'placeholder' => 'Please select a role',
))
- ->add('project', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Project'
+ ->add('project', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Project',
))
;
}
-
+
/**
- * @param OptionsResolverInterface $resolver
+ * {@inheritdoc}
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\UserProjects'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\UserProjects',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_userprojects';
}
-
}
diff --git a/src/VersionControl/GitControlBundle/Form/EditUserType.php b/app/src/VersionControl/GitControlBundle/Form/EditUserType.php
similarity index 84%
rename from src/VersionControl/GitControlBundle/Form/EditUserType.php
rename to app/src/VersionControl/GitControlBundle/Form/EditUserType.php
index f7bc0e9..5f69f4e 100644
--- a/src/VersionControl/GitControlBundle/Form/EditUserType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/EditUserType.php
@@ -1,40 +1,40 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-
-
-class EditUserType extends AbstractType
-{
- public function buildForm(FormBuilderInterface $builder, array $options)
- {
- $builder->add('name')
-
- ->add('admin', CheckboxType::class, array(
- 'label' => 'Admin',
- 'required' => false,
- ));
- }
-
- public function getParent()
- {
- return 'fos_user_profile';
- }
-
- public function getName()
- {
- return 'version_control_user_edit';
- }
-}
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use FOS\UserBundle\Form\Type\ProfileFormType;
+
+class EditUserType extends AbstractType
+{
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $builder->add('name')
+
+ ->add('admin', CheckboxType::class, array(
+ 'label' => 'Admin',
+ 'required' => false,
+ ));
+ }
+
+ public function getParent()
+ {
+ return ProfileFormType::class;
+ }
+
+ public function getBlockPrefix()
+ {
+ return 'version_control_user_edit';
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php b/app/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php
similarity index 71%
rename from src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php
rename to app/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php
index cf5ada4..2b0e4e7 100644
--- a/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php
@@ -7,27 +7,31 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Form\Embbed;
+namespace VersionControl\GitControlBundle\Form\Embbed;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+
/**
- * Description of ProjectEnvironmentEmbbedType
+ * Description of ProjectEnvironmentEmbbedType.
*
* @author paul
*/
-class ProjectEnvironmentEmbbedType extends AbstractType{
-
+class ProjectEnvironmentEmbbedType extends AbstractType
+{
//put your code here
- public function getName(){
+ public function getBlockPrefix()
+ {
return 'projectenvironmentembbed';
}
-
- public function getParent(){
- return 'collection';
+
+ public function getParent()
+ {
+ return CollectionType::class;
}
-
+
/**
* @param OptionsResolverInterface $resolver
*/
@@ -36,8 +40,7 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefaults(array(
//'data_class' => 'Lre\MetadataBundle\Entity\Curriculum\ResourceCurriculum',
//'data_class' => NULL,
- 'cascade_validation' => true,
+ //'cascade_validation' => true,
));
}
-
}
diff --git a/app/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentPositionType.php b/app/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentPositionType.php
new file mode 100644
index 0000000..847dbc7
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentPositionType.php
@@ -0,0 +1,49 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Form\Embbed;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use VersionControl\GitControlBundle\Entity\ProjectEnvironment;
+
+class ProjectEnvironmentPositionType extends AbstractType
+{
+ /**
+ * @param FormBuilderInterface $builder
+ * @param array $options
+ */
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $builder
+ ->add('position', HiddenType::class);
+ }
+
+ /**
+ * @param OptionsResolver $resolver
+ */
+ public function configureOptions(OptionsResolver $resolver): void
+ {
+ $resolver->setDefaults(array(
+ 'data_class' => ProjectEnvironment::class,
+ ));
+ }
+
+ /**
+ * @return string
+ */
+ public function getBlockPrefix()
+ {
+ return 'versioncontrol_gitcontrolbundle_projectenvironment_position';
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Form/Field/EntityHiddenType.php b/app/src/VersionControl/GitControlBundle/Form/Field/EntityHiddenType.php
similarity index 81%
rename from src/VersionControl/GitControlBundle/Form/Field/EntityHiddenType.php
rename to app/src/VersionControl/GitControlBundle/Form/Field/EntityHiddenType.php
index e441417..d8dab7d 100644
--- a/src/VersionControl/GitControlBundle/Form/Field/EntityHiddenType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/Field/EntityHiddenType.php
@@ -7,13 +7,15 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form\Field;
use Symfony\Component\Form\AbstractType;
use Dpn\ToolsBundle\Form\DataTransformer\EntityToIdTransformer;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
use Doctrine\Common\Persistence\ObjectManager;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
class EntityHiddenType extends AbstractType
{
@@ -21,19 +23,22 @@ class EntityHiddenType extends AbstractType
* @var ObjectManager
*/
protected $objectManager;
-
+
public function __construct(ObjectManager $objectManager)
{
$this->objectManager = $objectManager;
}
-
+
public function buildForm(FormBuilderInterface $builder, array $options)
{
$transformer = new EntityToIdTransformer($this->objectManager, $options['class']);
$builder->addModelTransformer($transformer);
}
-
- public function setDefaultOptions(OptionsResolverInterface $resolver)
+
+ /**
+ * {@inheritdoc}
+ */
+ public function configureOptions(OptionsResolver $resolver)
{
$resolver
->setRequired(array('class'))
@@ -42,14 +47,14 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
))
;
}
-
+
public function getParent()
{
- return 'hidden';
+ return HiddenType::class;
}
-
- public function getName()
+
+ public function getBlockPrefix()
{
return 'entity_hidden';
}
-}
\ No newline at end of file
+}
diff --git a/src/VersionControl/GitControlBundle/Form/IssueCommentType.php b/app/src/VersionControl/GitControlBundle/Form/IssueCommentType.php
similarity index 72%
rename from src/VersionControl/GitControlBundle/Form/IssueCommentType.php
rename to app/src/VersionControl/GitControlBundle/Form/IssueCommentType.php
index 9a15832..19c55b2 100644
--- a/src/VersionControl/GitControlBundle/Form/IssueCommentType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/IssueCommentType.php
@@ -7,43 +7,45 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class IssueCommentType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('comment')
- ->add('issue', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Issue'
+ ->add('issue', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Issue',
))
;
}
-
+
/**
- * @param OptionsResolverInterface $resolver
+ * {@inheritdoc}
*/
- public function setDefaultOptions(OptionsResolverInterface $resolver)
+ public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\IssueComment'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\IssueComment',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_issuecomment';
}
diff --git a/src/VersionControl/GitControlBundle/Form/IssueEditType.php b/app/src/VersionControl/GitControlBundle/Form/IssueEditType.php
similarity index 69%
rename from src/VersionControl/GitControlBundle/Form/IssueEditType.php
rename to app/src/VersionControl/GitControlBundle/Form/IssueEditType.php
index 63af9c9..56701fd 100644
--- a/src/VersionControl/GitControlBundle/Form/IssueEditType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/IssueEditType.php
@@ -7,64 +7,60 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-
+use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\EntityType;
-
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
class IssueEditType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('title')
->add('description')
- ->add('status',ChoiceType::class,array('label' => 'State'
- ,'choices' => array('open' => 'Open', 'closed' => 'Close')
- ,'required' => false
- ,'empty_value' => 'Please select a State')
+ ->add('status', ChoiceType::class, array('label' => 'State', 'choices' => array('open' => 'Open', 'closed' => 'Close'), 'required' => false, 'placeholder' => 'Please select a State')
)
- ->add('issueMilestone',EntityType::class,array(
+ ->add('issueMilestone', EntityType::class, array(
'multiple' => false, // Multiple selection allowed
//'expanded' => true, // Render as checkboxes
'placeholder' => 'Choose a milestone',
'required' => false,
'property' => 'title', // Assuming that the entity has a "name" property
- 'class' => 'VersionControl\GitControlBundle\Entity\IssueMilestone'
+ 'class' => 'VersionControl\GitControlBundle\Entity\IssueMilestone',
))
- ->add('issueLabel',EntityType::class,array(
+ ->add('issueLabel', EntityType::class, array(
'multiple' => true, // Multiple selection allowed
'expanded' => true, // Render as checkboxes
'property' => 'title', // Assuming that the entity has a "name" property
'class' => 'VersionControl\GitControlBundle\Entity\IssueLabel',
- 'required' => false
+ 'required' => false,
))
;
}
-
+
/**
- * @param OptionsResolverInterface $resolver
+ * {@inheritdoc}
*/
- public function setDefaultOptions(OptionsResolverInterface $resolver)
+ public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\Issue'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\Issue',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_issue';
}
diff --git a/src/VersionControl/GitControlBundle/Form/IssueLabelType.php b/app/src/VersionControl/GitControlBundle/Form/IssueLabelType.php
similarity index 72%
rename from src/VersionControl/GitControlBundle/Form/IssueLabelType.php
rename to app/src/VersionControl/GitControlBundle/Form/IssueLabelType.php
index 4b23ae9..e2a06c5 100644
--- a/src/VersionControl/GitControlBundle/Form/IssueLabelType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/IssueLabelType.php
@@ -7,43 +7,45 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class IssueLabelType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('title')
->add('hexColor')
- ->add('project', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Project'
+ ->add('project', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Project',
))
;
}
-
+
/**
- * @param OptionsResolverInterface $resolver
+ * {@inheritdoc}
*/
- public function setDefaultOptions(OptionsResolverInterface $resolver)
+ public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\IssueLabel'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\IssueLabel',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_issuelabel';
}
diff --git a/src/VersionControl/GitControlBundle/Form/IssueMilestoneType.php b/app/src/VersionControl/GitControlBundle/Form/IssueMilestoneType.php
similarity index 81%
rename from src/VersionControl/GitControlBundle/Form/IssueMilestoneType.php
rename to app/src/VersionControl/GitControlBundle/Form/IssueMilestoneType.php
index 3c7209a..df3f8a4 100644
--- a/src/VersionControl/GitControlBundle/Form/IssueMilestoneType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/IssueMilestoneType.php
@@ -7,20 +7,20 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
-
-use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class IssueMilestoneType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
@@ -28,29 +28,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
->add('title')
->add('description')
//->add('dueOn')
- ->add('dueOn', DateTimeType::class, array('date_widget' => "single_text", 'time_widget' => "single_text" ,'required' => false,))
+ ->add('dueOn', DateTimeType::class, array('date_widget' => 'single_text', 'time_widget' => 'single_text', 'required' => false))
- ->add('project', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Project'
+ ->add('project', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Project',
))
;
}
-
+
/**
* @param OptionsResolverInterface $resolver
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\IssueMilestone'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\IssueMilestone',
));
}
-
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_issuemilestone';
}
diff --git a/src/VersionControl/GitControlBundle/Form/IssueType.php b/app/src/VersionControl/GitControlBundle/Form/IssueType.php
similarity index 78%
rename from src/VersionControl/GitControlBundle/Form/IssueType.php
rename to app/src/VersionControl/GitControlBundle/Form/IssueType.php
index 2cd7438..fba1426 100644
--- a/src/VersionControl/GitControlBundle/Form/IssueType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/IssueType.php
@@ -7,27 +7,23 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
use VersionControl\GitControlBundle\Repository\IssueMilestoneRepository;
//use VersionControl\GitControlBundle\Repository\IssueLabelRepository;
use Doctrine\ORM\EntityRepository;
-
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Form\Extension\Core\Type\EntityType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class IssueType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
@@ -40,7 +36,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
//->add('createdAt')
//->add('updatedAt')
//->add('githubNumber')
- ->add('issueMilestone',EntityType::class,array(
+ ->add('issueMilestone', EntityType::class, array(
'multiple' => false, // Multiple selection allowed
//'expanded' => true, // Render as checkboxes
'placeholder' => 'Choose a milestone',
@@ -54,11 +50,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
->orderBy('a.id', 'ASC');
},
))
- ->add('project', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Project'
+ ->add('project', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Project',
))
//->add('verUser')
- ->add('issueLabel',EntityType::class,array(
+ ->add('issueLabel', EntityType::class, array(
'multiple' => true, // Multiple selection allowed
'expanded' => true, // Render as checkboxes
'property' => 'title', // Assuming that the entity has a "name" property
@@ -73,22 +69,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
))
;
}
-
+
/**
- * @param OptionsResolverInterface $resolver
+ * {@inheritdoc}
*/
- public function setDefaultOptions(OptionsResolverInterface $resolver)
+ public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\Issue'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\Issue',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_issue';
}
-}
\ No newline at end of file
+}
diff --git a/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentFilePermType.php b/app/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentFilePermType.php
similarity index 53%
rename from src/VersionControl/GitControlBundle/Form/ProjectEnvironmentFilePermType.php
rename to app/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentFilePermType.php
index 926cfdf..7620485 100644
--- a/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentFilePermType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentFilePermType.php
@@ -7,100 +7,100 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
class ProjectEnvironmentFilePermType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('fileOwner')
->add('fileGroup')
- ->add('enableFilePermissions',CheckboxType::class, array(
- 'label' => 'Update file permissions when git alters files?',
+ ->add('enableFilePermissions', CheckboxType::class, array(
+ 'label' => 'Update file permissions when git alters files?',
'required' => false,
))
- ->add('permissionOwnerRead',CheckboxType::class, array(
- 'label' => 'Read',
+ ->add('permissionOwnerRead', CheckboxType::class, array(
+ 'label' => 'Read',
'required' => false,
))
- ->add('permissionOwnerWrite',CheckboxType::class, array(
- 'label' => 'Write',
+ ->add('permissionOwnerWrite', CheckboxType::class, array(
+ 'label' => 'Write',
'required' => false,
))
- ->add('permissionOwnerExecute',CheckboxType::class, array(
- 'label' => 'Execute',
+ ->add('permissionOwnerExecute', CheckboxType::class, array(
+ 'label' => 'Execute',
'required' => false,
))
- ->add('permissionStickyUid',CheckboxType::class, array(
- 'label' => 'Set UID',
+ ->add('permissionStickyUid', CheckboxType::class, array(
+ 'label' => 'Set UID',
'required' => false,
))
-
- ->add('permissionGroupRead',CheckboxType::class, array(
- 'label' => 'Read',
+
+ ->add('permissionGroupRead', CheckboxType::class, array(
+ 'label' => 'Read',
'required' => false,
))
- ->add('permissionGroupWrite',CheckboxType::class, array(
- 'label' => 'Write',
+ ->add('permissionGroupWrite', CheckboxType::class, array(
+ 'label' => 'Write',
'required' => false,
))
- ->add('permissionGroupExecute',CheckboxType::class, array(
- 'label' => 'Execute',
+ ->add('permissionGroupExecute', CheckboxType::class, array(
+ 'label' => 'Execute',
'required' => false,
))
- ->add('permissionStickyGid',CheckboxType::class, array(
- 'label' => 'Set GID',
+ ->add('permissionStickyGid', CheckboxType::class, array(
+ 'label' => 'Set GID',
'required' => false,
))
-
- ->add('permissionOtherRead',CheckboxType::class, array(
- 'label' => 'Read',
+
+ ->add('permissionOtherRead', CheckboxType::class, array(
+ 'label' => 'Read',
'required' => false,
))
- ->add('permissionOtherWrite',CheckboxType::class, array(
- 'label' => 'Write',
+ ->add('permissionOtherWrite', CheckboxType::class, array(
+ 'label' => 'Write',
'required' => false,
))
- ->add('permissionOtherExecute',CheckboxType::class, array(
- 'label' => 'Execute',
+ ->add('permissionOtherExecute', CheckboxType::class, array(
+ 'label' => 'Execute',
'required' => false,
))
- ->add('permissionStickyBit',CheckboxType::class, array(
- 'label' => 'Set UID',
+ ->add('permissionStickyBit', CheckboxType::class, array(
+ 'label' => 'Set UID',
'required' => false,
))
-
+
->add('fileMode')
-
+
;
}
-
+
/**
* @param OptionsResolverInterface $resolver
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\ProjectEnvironmentFilePerm'
- ,'cascade_validation' => true
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\ProjectEnvironmentFilePerm',
+ //,'cascade_validation' => true
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_projectenvironmentfileperm';
}
diff --git a/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentType.php b/app/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentType.php
similarity index 63%
rename from src/VersionControl/GitControlBundle/Form/ProjectEnvironmentType.php
rename to app/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentType.php
index acc707c..b144001 100644
--- a/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/ProjectEnvironmentType.php
@@ -7,6 +7,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
@@ -15,20 +16,20 @@
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
class ProjectEnvironmentType extends AbstractType
{
protected $useCloneLocation;
-
- public function __construct($useCloneLocation = false) {
+
+ public function __construct($useCloneLocation = false)
+ {
$this->useCloneLocation = $useCloneLocation;
}
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
@@ -36,23 +37,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
->add('title')
->add('description')
->add('path')
- ->add('ssh',CheckboxType::class, array(
- 'label' => 'Use SSH?',
+ ->add('ssh', CheckboxType::class, array(
+ 'label' => 'Use SSH?',
'required' => false,
))
->add('host')
->add('username')
- ->add('password',PasswordType::class,array('required' => false))
- ->add('privateKey',TextareaType::class,array('required' => false))
- ->add('privateKeyPassword',PasswordType::class,array('required' => false))
- ->add('projectEnvironmentFilePerm', new ProjectEnvironmentFilePermType(), array('required' => false));
-
- if($this->useCloneLocation === true){
- $builder->add('gitCloneLocation',TextType::class,array('required' => false)) ;
+ ->add('password', PasswordType::class, array('required' => false))
+ ->add('privateKey', TextareaType::class, array('required' => false))
+ ->add('privateKeyPassword', PasswordType::class, array('required' => false))
+ ->add('projectEnvironmentFilePerm', ProjectEnvironmentFilePermType::class, array('required' => false));
+
+ if ($this->useCloneLocation === true) {
+ $builder->add('gitCloneLocation', TextType::class, array('required' => false));
}
-
}
-
+
/**
* @param OptionsResolverInterface $resolver
*/
@@ -60,17 +60,16 @@ public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
'data_class' => 'VersionControl\GitControlBundle\Entity\ProjectEnvironment'
- ,'cascade_validation' => true
- ,'validation_groups' => function (FormInterface $form) {
-
- if($form->has('gitaction')){
- $gitAction = $form->get('gitaction')->getData();
-
+ //,'cascade_validation' => true
+, 'validation_groups' => function (FormInterface $form) {
+ if ($form->has('gitaction')) {
+ $gitAction = $form->get('gitaction')->getData();
+
if ($gitAction == 'new') {
return array('Default', 'NewGit');
- }elseif ($gitAction == 'clone') {
+ } elseif ($gitAction == 'clone') {
return array('Default', 'CloneGit');
- }elseif ($gitAction == 'existing') {
+ } elseif ($gitAction == 'existing') {
return array('Default', 'ExistingGit');
}
}
@@ -83,7 +82,7 @@ public function configureOptions(OptionsResolver $resolver)
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_projectenvironment';
}
diff --git a/src/VersionControl/GitControlBundle/Form/ProjectIssueIntegratorType.php b/app/src/VersionControl/GitControlBundle/Form/ProjectIssueIntegratorType.php
similarity index 71%
rename from src/VersionControl/GitControlBundle/Form/ProjectIssueIntegratorType.php
rename to app/src/VersionControl/GitControlBundle/Form/ProjectIssueIntegratorType.php
index 9a8e1e5..aedada5 100644
--- a/src/VersionControl/GitControlBundle/Form/ProjectIssueIntegratorType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/ProjectIssueIntegratorType.php
@@ -7,57 +7,57 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\EntityType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class ProjectIssueIntegratorType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('repoType',ChoiceType::class, [
+ ->add('repoType', ChoiceType::class, [
'choices' => [
'Github' => 'Github',
'GitLab' => 'GitLab',
'BitBucket' => 'BitBucket',
],
- 'choices_as_values' => true
+ 'choices_as_values' => true,
]
)
->add('repoName')
->add('ownerName')
->add('apiToken')
->add('url')
- ->add('project', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Project'
+ ->add('project', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Project',
))
;
}
-
+
/**
- * @param OptionsResolverInterface $resolver
+ * {@inheritdoc}
*/
- public function setDefaultOptions(OptionsResolverInterface $resolver)
+ public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_projectissueintegrator';
}
diff --git a/src/VersionControl/GitControlBundle/Form/ProjectType.php b/app/src/VersionControl/GitControlBundle/Form/ProjectType.php
similarity index 72%
rename from src/VersionControl/GitControlBundle/Form/ProjectType.php
rename to app/src/VersionControl/GitControlBundle/Form/ProjectType.php
index a48ee34..0511a85 100644
--- a/src/VersionControl/GitControlBundle/Form/ProjectType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/ProjectType.php
@@ -7,50 +7,50 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
-use VersionControl\GitControlBundle\Form\Embbed\ProjectEnvironmentEmbbedType;
-use VersionControl\GitControlBundle\Form\ProjectEnvironmentType;
+use VersionControl\GitControlBundle\Form\Embbed\ProjectEnvironmentPositionType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
class ProjectType extends AbstractType
{
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('title')
->add('description')
- /*->add('projectEnvironment', new ProjectEnvironmentEmbbedType, array(
- 'type' => new ProjectEnvironmentType(),
- 'allow_add' => true,
- //'prototype' => true,
+ ->add('projectEnvironment', CollectionType::class, array(
+ 'type' => new ProjectEnvironmentPositionType(),
+ 'allow_add' => false,
+ 'prototype' => false,
'by_reference' => false,
- 'allow_delete' => true,
- ))*/
+ 'allow_delete' => false,
+ ))
;
}
-
+
/**
* @param OptionsResolverInterface $resolver
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\Project'
- ,'cascade_validation' => true
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\Project',
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_project';
}
diff --git a/src/VersionControl/GitControlBundle/Form/RegistrationType.php b/app/src/VersionControl/GitControlBundle/Form/RegistrationType.php
similarity index 73%
rename from src/VersionControl/GitControlBundle/Form/RegistrationType.php
rename to app/src/VersionControl/GitControlBundle/Form/RegistrationType.php
index d2724a0..4eb2c28 100644
--- a/src/VersionControl/GitControlBundle/Form/RegistrationType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/RegistrationType.php
@@ -1,37 +1,34 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class RegistrationType extends AbstractType
-{
- public function buildForm(FormBuilderInterface $builder, array $options)
- {
- $builder->add('name');
-
- /*->add('admin', 'checkbox', array(
- 'label' => 'Admin',
- 'required' => false,
- ));*/
- }
-
- public function getParent()
- {
- return 'fos_user_registration';
- }
-
- public function getName()
- {
- return 'version_control_user_registration';
- }
-}
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use FOS\UserBundle\Form\Type\RegistrationFormType;
+
+class RegistrationType extends AbstractType
+{
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $builder->add('name');
+ }
+
+ public function getParent()
+ {
+ return RegistrationFormType::class;
+ }
+
+ public function getBlockPrefix()
+ {
+ return 'version_control_user_registration';
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Form/UserProjectsType.php b/app/src/VersionControl/GitControlBundle/Form/UserProjectsType.php
similarity index 59%
rename from src/VersionControl/GitControlBundle/Form/UserProjectsType.php
rename to app/src/VersionControl/GitControlBundle/Form/UserProjectsType.php
index 468cf52..dd3c789 100644
--- a/src/VersionControl/GitControlBundle/Form/UserProjectsType.php
+++ b/app/src/VersionControl/GitControlBundle/Form/UserProjectsType.php
@@ -7,45 +7,36 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Doctrine\ORM\EntityRepository;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\EntityType;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Lrotherfield\Component\Form\Type\HiddenEntityType;
class UserProjectsType extends AbstractType
{
-
- /**
- * Project Id. Used in query to select all user not apart of this project already
- *
- * @var integer
- */
- protected $projectId;
-
/**
* @param FormBuilderInterface $builder
- * @param array $options
+ * @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
- $projectId = $this->getProjectId();
+ $projectId = $options['projectId'];
+
$builder
- ->add('roles',ChoiceType::class, array(
- 'label' => 'User Role'
- ,'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master')
- ,'required' => false
- ,'empty_value' => 'Please select a role'
+ ->add('roles', ChoiceType::class, array(
+ 'label' => 'User Role', 'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master'), 'required' => false, 'placeholder' => 'Please select a role', 'choices_as_values' => true,
))
- ->add('user',EntityType::class, array(
+ ->add('user', EntityType::class, array(
'class' => 'VersionControl\GitControlBundle\Entity\User\User',
'choice_label' => 'username',
- 'empty_value' => 'Please select a user',
- 'query_builder' => function(EntityRepository $er) use($projectId) {
+ 'placeholder' => 'Please select a user',
+ 'query_builder' => function (EntityRepository $er) use ($projectId) {
$qb = $er->createQueryBuilder('a');
$nots = $qb
@@ -60,47 +51,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
->orderBy('u.username', 'ASC');
},
))
- ->add('project', 'hidden_entity',array(
- 'class' => 'VersionControl\GitControlBundle\Entity\Project'
+ ->add('project', HiddenEntityType::class, array(
+ 'class' => 'VersionControl\GitControlBundle\Entity\Project',
))
;
}
-
+
/**
* @param OptionsResolverInterface $resolver
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
- 'data_class' => 'VersionControl\GitControlBundle\Entity\UserProjects'
+ 'data_class' => 'VersionControl\GitControlBundle\Entity\UserProjects',
+ 'projectId' => null,
));
}
/**
* @return string
*/
- public function getName()
+ public function getBlockPrefix()
{
return 'versioncontrol_gitcontrolbundle_userprojects';
}
-
- /**
- * Gets the project Id
- * @return integer
- */
- public function getProjectId() {
- return $this->projectId;
- }
-
- /**
- * Sets the project Id
- * @param integer $projectId
- * @return \VersionControl\GitControlBundle\Form\UserProjectsType
- */
- public function setProjectId($projectId) {
- $this->projectId = $projectId;
- return $this;
- }
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Installer/DatabaseInstall.php b/app/src/VersionControl/GitControlBundle/Installer/DatabaseInstall.php
similarity index 90%
rename from src/VersionControl/GitControlBundle/Installer/DatabaseInstall.php
rename to app/src/VersionControl/GitControlBundle/Installer/DatabaseInstall.php
index 415e8a5..4af72d9 100644
--- a/src/VersionControl/GitControlBundle/Installer/DatabaseInstall.php
+++ b/app/src/VersionControl/GitControlBundle/Installer/DatabaseInstall.php
@@ -8,10 +8,10 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Installer;
use Doctrine\DBAL\Connection;
-use Symfony\Component\Filesystem\Filesystem;
class DatabaseInstall
{
@@ -34,7 +34,6 @@ public function setOutput($output)
$this->output = $output;
}
-
protected function runQueriesFromFile($file)
{
$queries = array_filter(preg_split('(;\\s*$)m', file_get_contents($file)));
@@ -54,7 +53,7 @@ protected function runQueriesFromFile($file)
$this->db->exec($query);
}
}
-
+
public function importSchema()
{
$this->runQueriesFromFile(
@@ -68,5 +67,11 @@ public function importData()
'src/VersionControl/GitControlBundle/Installer/dbscript/data.sql'
);
}
-}
+ public function importTestData()
+ {
+ $this->runQueriesFromFile(
+ 'src/VersionControl/GitControlBundle/Installer/dbscript/testData.sql'
+ );
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Installer/dbscript/data.sql b/app/src/VersionControl/GitControlBundle/Installer/dbscript/data.sql
similarity index 97%
rename from src/VersionControl/GitControlBundle/Installer/dbscript/data.sql
rename to app/src/VersionControl/GitControlBundle/Installer/dbscript/data.sql
index 9864557..1ecfd35 100644
--- a/src/VersionControl/GitControlBundle/Installer/dbscript/data.sql
+++ b/app/src/VersionControl/GitControlBundle/Installer/dbscript/data.sql
@@ -1,14 +1,14 @@
---
--- Dumping data for table issue_label
---
-
-INSERT INTO issue_label (id, title, hex_color, all_projects, project_id) VALUES
-(1, 'New Feature', '4171f6', 1, NULL),
-(2, 'Bug', 'ff0000', 1, NULL),
-(3, 'Enhancement', 'd900ff', 1, NULL),
-(4, 'Maintenance', 'ff7070', 1, NULL),
-(5, 'Dublicate', 'c9c9c9', 1, NULL),
-(6, 'Help wanted', '008000', 1, NULL),
-(7, 'Invalid', 'b0b0b0', 1, NULL),
-(8, 'Question', 'bf4051', 1, NULL),
+--
+-- Dumping data for table issue_label
+--
+
+INSERT INTO issue_label (id, title, hex_color, all_projects, project_id) VALUES
+(1, 'New Feature', '4171f6', 1, NULL),
+(2, 'Bug', 'ff0000', 1, NULL),
+(3, 'Enhancement', 'd900ff', 1, NULL),
+(4, 'Maintenance', 'ff7070', 1, NULL),
+(5, 'Dublicate', 'c9c9c9', 1, NULL),
+(6, 'Help wanted', '008000', 1, NULL),
+(7, 'Invalid', 'b0b0b0', 1, NULL),
+(8, 'Question', 'bf4051', 1, NULL),
(9, 'Wontfix', 'ff6600', 1, NULL);
\ No newline at end of file
diff --git a/app/src/VersionControl/GitControlBundle/Installer/dbscript/schema.sql b/app/src/VersionControl/GitControlBundle/Installer/dbscript/schema.sql
new file mode 100644
index 0000000..b0b757e
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Installer/dbscript/schema.sql
@@ -0,0 +1,483 @@
+-- MySQL Script generated by MySQL Workbench
+-- 10/18/16 10:58:43
+-- Model: New Model Version: 1.0
+-- MySQL Workbench Forward Engineering
+
+SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
+
+-- -----------------------------------------------------
+-- Schema version-control
+-- -----------------------------------------------------
+
+
+-- -----------------------------------------------------
+-- Table `ver_user`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `ver_user` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `username` VARCHAR(255) CHARACTER SET 'utf8' NOT NULL,
+ `username_canonical` VARCHAR(255) CHARACTER SET 'utf8' NOT NULL,
+ `email` VARCHAR(255) CHARACTER SET 'utf8' NOT NULL,
+ `email_canonical` VARCHAR(255) CHARACTER SET 'utf8' NOT NULL,
+ `enabled` TINYINT(1) NOT NULL,
+ `salt` VARCHAR(255) CHARACTER SET 'utf8' NOT NULL,
+ `password` VARCHAR(255) CHARACTER SET 'utf8' NOT NULL,
+ `last_login` DATETIME NULL DEFAULT NULL,
+ `locked` TINYINT(1) NOT NULL DEFAULT 0,
+ `expired` TINYINT(1) NOT NULL DEFAULT 0,
+ `expires_at` DATETIME NULL DEFAULT NULL,
+ `confirmation_token` VARCHAR(255) CHARACTER SET 'utf8' NULL,
+ `password_requested_at` DATETIME NULL DEFAULT NULL,
+ `roles` LONGTEXT CHARACTER SET 'utf8' NOT NULL,
+ `credentials_expired` TINYINT(1) NOT NULL DEFAULT 0,
+ `credentials_expire_at` DATETIME NULL DEFAULT NULL,
+ `name` VARCHAR(255) NULL DEFAULT NULL,
+ `github_id` VARCHAR(255) NULL,
+ `github_access_token` VARCHAR(255) NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `UNIQ_86EDD9B992FC23A8` (`username_canonical` ASC),
+ UNIQUE INDEX `UNIQ_86EDD9B9A0D96FBF` (`email_canonical` ASC))
+ENGINE = InnoDB
+AUTO_INCREMENT = 2;
+
+
+-- -----------------------------------------------------
+-- Table `acl_classes`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `acl_classes` (
+ `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `class_type` VARCHAR(200) CHARACTER SET 'utf8' NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `UNIQ_69DD750638A36066` (`class_type` ASC))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
+
+
+-- -----------------------------------------------------
+-- Table `acl_security_identities`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `acl_security_identities` (
+ `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `identifier` VARCHAR(200) CHARACTER SET 'utf8' NOT NULL,
+ `username` TINYINT(1) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `UNIQ_8835EE78772E836AF85E0677` (`identifier` ASC, `username` ASC))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
+
+
+-- -----------------------------------------------------
+-- Table `acl_object_identities`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `acl_object_identities` (
+ `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `parent_object_identity_id` INT(10) UNSIGNED NULL DEFAULT NULL,
+ `class_id` INT(10) UNSIGNED NOT NULL,
+ `object_identifier` VARCHAR(100) CHARACTER SET 'utf8' NOT NULL,
+ `entries_inheriting` TINYINT(1) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `UNIQ_9407E5494B12AD6EA000B10` (`object_identifier` ASC, `class_id` ASC),
+ INDEX `IDX_9407E54977FA751A` (`parent_object_identity_id` ASC),
+ CONSTRAINT `FK_9407E54977FA751A`
+ FOREIGN KEY (`parent_object_identity_id`)
+ REFERENCES `acl_object_identities` (`id`))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
+
+
+-- -----------------------------------------------------
+-- Table `acl_entries`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `acl_entries` (
+ `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `class_id` INT(10) UNSIGNED NOT NULL,
+ `object_identity_id` INT(10) UNSIGNED NULL DEFAULT NULL,
+ `security_identity_id` INT(10) UNSIGNED NOT NULL,
+ `field_name` VARCHAR(50) CHARACTER SET 'utf8' NULL DEFAULT NULL,
+ `ace_order` SMALLINT(5) UNSIGNED NOT NULL,
+ `mask` INT(11) NOT NULL,
+ `granting` TINYINT(1) NOT NULL,
+ `granting_strategy` VARCHAR(30) CHARACTER SET 'utf8' NOT NULL,
+ `audit_success` TINYINT(1) NOT NULL,
+ `audit_failure` TINYINT(1) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE INDEX `UNIQ_46C8B806EA000B103D9AB4A64DEF17BCE4289BF4` (`class_id` ASC, `object_identity_id` ASC, `field_name` ASC, `ace_order` ASC),
+ INDEX `IDX_46C8B806EA000B103D9AB4A6DF9183C9` (`class_id` ASC, `object_identity_id` ASC, `security_identity_id` ASC),
+ INDEX `IDX_46C8B806EA000B10` (`class_id` ASC),
+ INDEX `IDX_46C8B8063D9AB4A6` (`object_identity_id` ASC),
+ INDEX `IDX_46C8B806DF9183C9` (`security_identity_id` ASC),
+ CONSTRAINT `FK_46C8B806DF9183C9`
+ FOREIGN KEY (`security_identity_id`)
+ REFERENCES `acl_security_identities` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE,
+ CONSTRAINT `FK_46C8B8063D9AB4A6`
+ FOREIGN KEY (`object_identity_id`)
+ REFERENCES `acl_object_identities` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE,
+ CONSTRAINT `FK_46C8B806EA000B10`
+ FOREIGN KEY (`class_id`)
+ REFERENCES `acl_classes` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
+
+
+-- -----------------------------------------------------
+-- Table `acl_object_identity_ancestors`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `acl_object_identity_ancestors` (
+ `object_identity_id` INT(10) UNSIGNED NOT NULL,
+ `ancestor_id` INT(10) UNSIGNED NOT NULL,
+ PRIMARY KEY (`object_identity_id`, `ancestor_id`),
+ INDEX `IDX_825DE2993D9AB4A6` (`object_identity_id` ASC),
+ INDEX `IDX_825DE299C671CEA1` (`ancestor_id` ASC),
+ CONSTRAINT `FK_825DE299C671CEA1`
+ FOREIGN KEY (`ancestor_id`)
+ REFERENCES `acl_object_identities` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE,
+ CONSTRAINT `FK_825DE2993D9AB4A6`
+ FOREIGN KEY (`object_identity_id`)
+ REFERENCES `acl_object_identities` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8
+COLLATE = utf8_unicode_ci;
+
+
+-- -----------------------------------------------------
+-- Table `project`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `project` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `title` VARCHAR(80) NOT NULL,
+ `description` VARCHAR(225) NULL,
+ `path` VARCHAR(225) NULL,
+ `ssh` TINYINT(1) NULL,
+ `host` VARCHAR(225) NULL,
+ `username` VARCHAR(225) NULL,
+ `password` LONGTEXT NULL,
+ `key_file` VARCHAR(225) NULL,
+ `creator_id` INT(11) NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_project_ver_user_idx` (`creator_id` ASC),
+ CONSTRAINT `fk_project_ver_user`
+ FOREIGN KEY (`creator_id`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `user_projects`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `user_projects` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `roles` VARCHAR(225) NULL,
+ `project_id` INT NOT NULL,
+ `ver_user_id` INT(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_table1_project1_idx` (`project_id` ASC),
+ INDEX `fk_table1_ver_user1_idx` (`ver_user_id` ASC),
+ CONSTRAINT `fk_table1_project1`
+ FOREIGN KEY (`project_id`)
+ REFERENCES `project` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_table1_ver_user1`
+ FOREIGN KEY (`ver_user_id`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `issue_milestone`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `issue_milestone` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `title` VARCHAR(255) NULL,
+ `description` LONGTEXT NULL,
+ `state` VARCHAR(45) NULL,
+ `due_on` DATETIME NULL,
+ `created_at` DATETIME NULL,
+ `updated_at` DATETIME NULL,
+ `closed_at` DATETIME NULL,
+ `ver_user_id` INT(11) NULL,
+ `project_id` INT NOT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_issue_milestone_ver_user1_idx` (`ver_user_id` ASC),
+ CONSTRAINT `fk_issue_milestone_ver_user1`
+ FOREIGN KEY (`ver_user_id`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `issue`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `issue` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `title` VARCHAR(255) NULL,
+ `description` LONGTEXT NULL,
+ `status` VARCHAR(45) NULL,
+ `closed_at` DATETIME NULL,
+ `created_at` DATETIME NULL,
+ `updated_at` DATETIME NULL,
+ `github_number` INT NULL,
+ `ver_user_id` INT(11) NULL,
+ `project_id` INT NOT NULL,
+ `issue_milestone_id` INT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_issue_ver_user1_idx` (`ver_user_id` ASC),
+ INDEX `fk_issue_project1_idx` (`project_id` ASC),
+ INDEX `fk_issue_issue_milestone1_idx` (`issue_milestone_id` ASC),
+ CONSTRAINT `fk_issue_ver_user1`
+ FOREIGN KEY (`ver_user_id`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_project1`
+ FOREIGN KEY (`project_id`)
+ REFERENCES `project` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_issue_milestone1`
+ FOREIGN KEY (`issue_milestone_id`)
+ REFERENCES `issue_milestone` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `issue_label`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `issue_label` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `title` VARCHAR(80) NULL,
+ `hex_color` VARCHAR(80) NULL,
+ `all_projects` TINYINT(1) NULL DEFAULT 0,
+ `project_id` INT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_issue_label_project1_idx` (`project_id` ASC),
+ CONSTRAINT `fk_issue_label_project1`
+ FOREIGN KEY (`project_id`)
+ REFERENCES `project` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `issue_comment`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `issue_comment` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `comment` LONGTEXT NULL,
+ `created_at` DATETIME NULL,
+ `updated_at` DATETIME NULL,
+ `ver_user_id` INT(11) NULL,
+ `issue_id` INT NOT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_issue_comment_ver_user1_idx` (`ver_user_id` ASC),
+ INDEX `fk_issue_comment_issue1_idx` (`issue_id` ASC),
+ CONSTRAINT `fk_issue_comment_ver_user1`
+ FOREIGN KEY (`ver_user_id`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_comment_issue1`
+ FOREIGN KEY (`issue_id`)
+ REFERENCES `issue` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `issue_has_issue_label`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `issue_has_issue_label` (
+ `issue_id` INT NOT NULL,
+ `issue_label_id` INT NOT NULL,
+ PRIMARY KEY (`issue_id`, `issue_label_id`),
+ INDEX `fk_issue_has_issue_label_issue_label1_idx` (`issue_label_id` ASC),
+ INDEX `fk_issue_has_issue_label_issue1_idx` (`issue_id` ASC),
+ CONSTRAINT `fk_issue_has_issue_label_issue1`
+ FOREIGN KEY (`issue_id`)
+ REFERENCES `issue` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_has_issue_label_issue_label1`
+ FOREIGN KEY (`issue_label_id`)
+ REFERENCES `issue_label` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `issue_event`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `issue_event` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `commit_id` VARCHAR(255) NULL,
+ `event` VARCHAR(80) NULL COMMENT 'closed\nreopened\nreferenced\nmentioned\nassigned\nunassigned\nlabeled\nunlabeled\nmilestoned\ndemilestoned\nrenamed',
+ `created_at` DATETIME NULL,
+ `issue_id` INT NOT NULL,
+ `issue_milestone_id` INT NOT NULL,
+ `issue_label_id` INT NOT NULL,
+ `ver_user_id` INT(11) NOT NULL,
+ `assignee` INT(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_issue_event_issue1_idx` (`issue_id` ASC),
+ INDEX `fk_issue_event_issue_milestone1_idx` (`issue_milestone_id` ASC),
+ INDEX `fk_issue_event_issue_label1_idx` (`issue_label_id` ASC),
+ INDEX `fk_issue_event_ver_user1_idx` (`ver_user_id` ASC),
+ INDEX `fk_issue_event_ver_user2_idx` (`assignee` ASC),
+ CONSTRAINT `fk_issue_event_issue1`
+ FOREIGN KEY (`issue_id`)
+ REFERENCES `issue` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_event_issue_milestone1`
+ FOREIGN KEY (`issue_milestone_id`)
+ REFERENCES `issue_milestone` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_event_issue_label1`
+ FOREIGN KEY (`issue_label_id`)
+ REFERENCES `issue_label` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_event_ver_user1`
+ FOREIGN KEY (`ver_user_id`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_issue_event_ver_user2`
+ FOREIGN KEY (`assignee`)
+ REFERENCES `ver_user` (`id`)
+ ON DELETE NO ACTION
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `project_environment_file_perm`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `project_environment_file_perm` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `file_owner` VARCHAR(80) NULL,
+ `file_group` VARCHAR(80) NULL,
+ `permission_owner_read` TINYINT(1) NULL,
+ `permission_owner_write` TINYINT(1) NULL,
+ `permission_owner_execute` TINYINT(1) NULL,
+ `permission_sticky_uid` TINYINT(1) NULL,
+ `permission_group_read` TINYINT(1) NULL,
+ `permission_group_write` TINYINT(1) NULL,
+ `permission_group_execute` TINYINT(1) NULL,
+ `permission_sticky_gid` TINYINT(1) NULL,
+ `permission_other_read` TINYINT(1) NULL,
+ `permission_other_write` TINYINT(1) NULL,
+ `permission_other_execute` TINYINT(1) NULL,
+ `permission_sticky_bit` TINYINT(1) NULL,
+ `enable_file_permissions` TINYINT(1) NULL,
+ PRIMARY KEY (`id`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `project_environment`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `project_environment` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `title` VARCHAR(80) NULL,
+ `description` VARCHAR(225) NULL,
+ `path` VARCHAR(225) NULL,
+ `ssh` TINYINT(1) NULL,
+ `host` VARCHAR(225) NULL,
+ `username` VARCHAR(225) NULL,
+ `password` LONGTEXT NULL,
+ `key_file` VARCHAR(225) NULL,
+ `project_id` INT NOT NULL,
+ `project_environment_file_perm_id` INT NULL,
+ `private_key` LONGTEXT NULL,
+ `private_key_password` LONGTEXT NULL,
+ `position` INT NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_project_environment_project1_idx` (`project_id` ASC),
+ INDEX `fk_project_environment_project_environment_file_perm1_idx` (`project_environment_file_perm_id` ASC),
+ CONSTRAINT `fk_project_environment_project1`
+ FOREIGN KEY (`project_id`)
+ REFERENCES `project` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE NO ACTION,
+ CONSTRAINT `fk_project_environment_project_environment_file_perm1`
+ FOREIGN KEY (`project_environment_file_perm_id`)
+ REFERENCES `project_environment_file_perm` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `project_issue_integrator`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `project_issue_integrator` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `project_id` INT NOT NULL,
+ `repo_type` VARCHAR(80) NULL,
+ `class_name` VARCHAR(255) NULL,
+ PRIMARY KEY (`id`),
+ INDEX `fk_project_issue_integrator_project1_idx` (`project_id` ASC),
+ CONSTRAINT `fk_project_issue_integrator_project1`
+ FOREIGN KEY (`project_id`)
+ REFERENCES `project` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE NO ACTION)
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `project_issue_integrator_gitlab`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `project_issue_integrator_gitlab` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `project_name` VARCHAR(255) NULL,
+ `url` VARCHAR(255) NULL,
+ `api_token` VARCHAR(255) NULL,
+ PRIMARY KEY (`id`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `project_issue_integrator_github`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `project_issue_integrator_github` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `repo_name` VARCHAR(255) NULL,
+ `owner_name` VARCHAR(255) NULL,
+ `api_token` VARCHAR(255) NULL,
+ PRIMARY KEY (`id`))
+ENGINE = InnoDB;
+
+
+SET SQL_MODE=@OLD_SQL_MODE;
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
diff --git a/app/src/VersionControl/GitControlBundle/Installer/dbscript/testData.sql b/app/src/VersionControl/GitControlBundle/Installer/dbscript/testData.sql
new file mode 100644
index 0000000..8b5a06c
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Installer/dbscript/testData.sql
@@ -0,0 +1,14 @@
+--
+-- Dumping data for table issue_label
+--
+
+INSERT INTO issue_label (id, title, hex_color, all_projects, project_id) VALUES
+(1, 'New Feature', '4171f6', 1, NULL),
+(2, 'Bug', 'ff0000', 1, NULL),
+(3, 'Enhancement', 'd900ff', 1, NULL),
+(4, 'Maintenance', 'ff7070', 1, NULL),
+(5, 'Dublicate', 'c9c9c9', 1, NULL),
+(6, 'Help wanted', '008000', 1, NULL),
+(7, 'Invalid', 'b0b0b0', 1, NULL),
+(8, 'Question', 'bf4051', 1, NULL),
+(9, 'Wontfix', 'ff6600', 1, NULL);
diff --git a/src/VersionControl/GitControlBundle/Repository/IssueLabelRepository.php b/app/src/VersionControl/GitControlBundle/Repository/IssueLabelRepository.php
similarity index 61%
rename from src/VersionControl/GitControlBundle/Repository/IssueLabelRepository.php
rename to app/src/VersionControl/GitControlBundle/Repository/IssueLabelRepository.php
index cc96dcd..d3644c9 100644
--- a/src/VersionControl/GitControlBundle/Repository/IssueLabelRepository.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/IssueLabelRepository.php
@@ -1,131 +1,143 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Repository;
-
-use Doctrine\ORM\EntityRepository;
-use VersionControl\GitControlBundle\Repository\Issues\IssueLabelRepositoryInterface;
-use VersionControl\GitControlBundle\Entity\IssueLabel;
-
-class IssueLabelRepository extends EntityRepository implements IssueLabelRepositoryInterface
-{
-
- /**
- *
- * @var VersionControl\GitControlBundle\Entity\Project
- */
- protected $project;
-
- /**
- * @var VersionControl\GitControlBundle\Entity\User\User
- */
- protected $currentUser;
-
- /**
- * Get Project
- */
- public function getProject() {
- return $this->project;
- }
-
- /**
- * Set Project
- */
- public function setProject($project) {
- $this->project = $project;
- return $this;
- }
-
- /**
- * Get Current User
- */
- public function getCurrentUser() {
- return $this->currentUser;
- }
-
- /**
- * Set Current User
- */
- public function setCurrentUser($currentUser) {
- $this->currentUser = $currentUser;
- return $this;
- }
-
- /**
- * Get all labels for project
- *
- * @return array of issueLabels
- */
- public function listLabels(){
- return $this->findByProject($this->project);
- }
-
- /**
- * Get label by id
- * @param integer $id
- */
- public function findLabelById($id){
- return $this->find($id);
- }
-
- /**
- * Gets a new Label entity
- * @param type $issue
- * @return VersionControl\GitControlBundle\Entity\Labels\Label
- */
- public function newLabel(){
- $issueEntity = new IssueLabel();
- $issueEntity->setProject($this->project);
- return $issueEntity;
- }
-
- /**
- * Create a new label
- * @param type $issueLabel
- */
- public function createLabel($issueLabel){
- $em=$this->getEntityManager();
-
- $em->persist($issueLabel);
- $em->flush();
-
- return $issueLabel;
- }
-
-
- /**
- * Update label
- * @param integer $issue
- */
- public function updateLabel($issueLabel){
- $em=$this->getEntityManager();
-
- $em->flush();
-
- return $issueLabel;
- }
-
- /**
- * Delete Label
- * @param integer $issueLabelId
- */
- public function deleteLabel($issueLabelId){
- $em=$this->getEntityManager();
- $issueLabel = $this->find($issueLabelId);
- if($issueLabel){
- $em->remove($issueLabel);
- $em->flush();
- }
- }
-
-
-
-
-}
-?>
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+use VersionControl\GitControlBundle\Repository\Issues\IssueLabelRepositoryInterface;
+use VersionControl\GitControlBundle\Entity\IssueLabel;
+
+class IssueLabelRepository extends EntityRepository implements IssueLabelRepositoryInterface
+{
+ /**
+ * @var VersionControl\GitControlBundle\Entity\Project
+ */
+ protected $project;
+
+ /**
+ * @var VersionControl\GitControlBundle\Entity\User\User
+ */
+ protected $currentUser;
+
+ /**
+ * Get Project.
+ */
+ public function getProject()
+ {
+ return $this->project;
+ }
+
+ /**
+ * Set Project.
+ */
+ public function setProject($project)
+ {
+ $this->project = $project;
+
+ return $this;
+ }
+
+ /**
+ * Get Current User.
+ */
+ public function getCurrentUser()
+ {
+ return $this->currentUser;
+ }
+
+ /**
+ * Set Current User.
+ */
+ public function setCurrentUser($currentUser)
+ {
+ $this->currentUser = $currentUser;
+
+ return $this;
+ }
+
+ /**
+ * Get all labels for project.
+ *
+ * @return array of issueLabels
+ */
+ public function listLabels()
+ {
+ return $this->findByProject($this->project);
+ }
+
+ /**
+ * Get label by id.
+ *
+ * @param int $id
+ */
+ public function findLabelById($id)
+ {
+ return $this->find($id);
+ }
+
+ /**
+ * Gets a new Label entity.
+ *
+ * @param type $issue
+ *
+ * @return VersionControl\GitControlBundle\Entity\Labels\Label
+ */
+ public function newLabel()
+ {
+ $issueEntity = new IssueLabel();
+ $issueEntity->setProject($this->project);
+
+ return $issueEntity;
+ }
+
+ /**
+ * Create a new label.
+ *
+ * @param type $issueLabel
+ */
+ public function createLabel($issueLabel)
+ {
+ $em = $this->getEntityManager();
+
+ $em->persist($issueLabel);
+ $em->flush();
+
+ return $issueLabel;
+ }
+
+ /**
+ * Update label.
+ *
+ * @param int $issue
+ */
+ public function updateLabel($issueLabel)
+ {
+ $em = $this->getEntityManager();
+
+ $em->flush();
+
+ return $issueLabel;
+ }
+
+ /**
+ * Delete Label.
+ *
+ * @param int $issueLabelId
+ */
+ public function deleteLabel($issueLabelId)
+ {
+ $em = $this->getEntityManager();
+ $issueLabel = $this->find($issueLabelId);
+ if ($issueLabel) {
+ $em->remove($issueLabel);
+ $em->flush();
+ }
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php b/app/src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php
similarity index 50%
rename from src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php
rename to app/src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php
index 5b571f0..f0f1c5c 100644
--- a/src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php
@@ -1,222 +1,232 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Repository;
-
-use Doctrine\ORM\EntityRepository;
-use VersionControl\GitControlBundle\Repository\Issues\IssueMilestoneRepositoryInterface;
-use VersionControl\GitControlBundle\Entity\IssueMilestone;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
-class IssueMilestoneRepository extends EntityRepository implements IssueMilestoneRepositoryInterface
-{
- /**
- *
- * @var VersionControl\GitControlBundle\Entity\Project
- */
- protected $project;
-
- /**
- * @var VersionControl\GitControlBundle\Entity\User\User
- */
- protected $currentUser;
-
- /**
- * Get Project
- */
- public function getProject() {
- return $this->project;
- }
-
- /**
- * Set Project
- */
- public function setProject($project) {
- $this->project = $project;
- return $this;
- }
-
- /**
- * Get Current User
- */
- public function getCurrentUser() {
- return $this->currentUser;
- }
-
- /**
- * Set Current User
- */
- public function setCurrentUser($currentUser) {
- $this->currentUser = $currentUser;
- return $this;
- }
-
- /**
- * Finds all milestones
- * @param string $keyword
- * @return array of issues
- */
- public function listMilestones($state = 'open'){
- return $this->findByProjectAndStatus($state,true);
- }
-
- /**
- * Get number of milestones for a state
- * @param string $state open|closed
- */
- public function countMilestones($state){
- return $this->countForProjectWithStatus($state);
- }
-
- /**
- * Find milestone for Id
- * @param integer $id
- */
- public function findMilestoneById($id){
- $issueMilestone = $this->find($id);
- if($issueMilestone){
- if($issueMilestone->getProject()->getId() !== $this->getProject()->getId()){
- throw new AccessDeniedException("Milestones project id is different to request project Id");
- }
- }
- return $issueMilestone;
- }
-
- /**
- * Gets a new Milestone entity
- *
- * @return VersionControl\GitControlBundle\Entity\IssueMilestone
- */
- public function newMilestone(){
- $issueMilestoneEntity = new IssueMilestone();
- return $issueMilestoneEntity;
- }
-
- /**
- *
- * @param VersionControl\GitControlBundle\Entity\IssueMilestone $issueMilestone
- */
- public function createMilestone($issueMilestone){
- $em=$this->getEntityManager();
-
- //Set User
- $issueMilestone->setVerUser($this->currentUser);
- //Set Project
- $issueMilestone->setProject($this->project);
-
- $em->persist($issueMilestone);
- $em->flush();
-
- return $issueMilestone;
- }
-
-
- /**
- *
- * @param VersionControl\GitControlBundle\Entity\IssueMilestone $issueMilestone
- */
- public function updateMilestone($issueMilestone){
- if($issueMilestone->getProject()->getId() !== $this->getProject()->getId()){
- throw new AccessDeniedException("Milestones project id is different to request project Id");
- }
-
- $em=$this->getEntityManager();
- $em->flush();
- return $issueMilestone;
- }
-
- /**
- *
- * @param integer $issueMilestoneId
- */
- public function deleteMilestone($id){
-
- $em=$this->getEntityManager();
- $issueMilestone = $this->findMilestoneById($id);
- if($issueMilestone){
- $em->remove($issueMilestone);
- $em->flush();
- }
- }
-
-
- /**
- *
- * @param integer $id
- */
- public function reOpenMilestone($id){
- $em=$this->getEntityManager();
- $issueMilestone = $this->findMilestoneById($id);
- if($issueMilestone){
- $issueMilestone->setOpen();
- $em->flush();
- }
- return $issueMilestone;
- }
-
- /**
- *
- * @param integer $id
- */
- public function closeMilestone($id){
- $em=$this->getEntityManager();
- $issueMilestone = $this->findMilestoneById($id);
- if($issueMilestone){
- $issueMilestone->setClosed();
- $em->flush();
- }
- return $issueMilestone;
- }
-
- /**
- *
- * @param type $project
- * @return integer
- */
- public function countForProjectWithStatus($status = 'open')
- {
-
- $qb = $this->findByProjectAndStatus($status,true);
-
- $qb->select('count(a)');
-
- return $qb->getQuery()->getSingleScalarResult();
-
- }
-
- public function findByProjectAndStatus($status = 'open',$queryOnly= false){
- $em=$this->getEntityManager();
- $qb = $em->createQueryBuilder();
-
- $where = 'a.project = :project';
- $parameters = array('project'=>$this->project);
-
-
- $qb->select('a')
- ->from('VersionControlGitControlBundle:IssueMilestone','a')
- ->where($where)
- ->setParameters($parameters);
-
- if($status){
- $qb->andWhere(
- $qb->expr()->like('a.state', ':status')
- )->setParameter('status', $status);
- }
-
- if($queryOnly === true){
- return $qb;
- }else{
- return $qb->getQuery()->getResult();
- }
-
- }
-
-}
-?>
\ No newline at end of file
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+use VersionControl\GitControlBundle\Repository\Issues\IssueMilestoneRepositoryInterface;
+use VersionControl\GitControlBundle\Entity\IssueMilestone;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+
+class IssueMilestoneRepository extends EntityRepository implements IssueMilestoneRepositoryInterface
+{
+ /**
+ * @var VersionControl\GitControlBundle\Entity\Project
+ */
+ protected $project;
+
+ /**
+ * @var VersionControl\GitControlBundle\Entity\User\User
+ */
+ protected $currentUser;
+
+ /**
+ * Get Project.
+ */
+ public function getProject()
+ {
+ return $this->project;
+ }
+
+ /**
+ * Set Project.
+ */
+ public function setProject($project)
+ {
+ $this->project = $project;
+
+ return $this;
+ }
+
+ /**
+ * Get Current User.
+ */
+ public function getCurrentUser()
+ {
+ return $this->currentUser;
+ }
+
+ /**
+ * Set Current User.
+ */
+ public function setCurrentUser($currentUser)
+ {
+ $this->currentUser = $currentUser;
+
+ return $this;
+ }
+
+ /**
+ * Finds all milestones.
+ *
+ * @param string $keyword
+ *
+ * @return array of issues
+ */
+ public function listMilestones($state = 'open')
+ {
+ return $this->findByProjectAndStatus($state, true);
+ }
+
+ /**
+ * Get number of milestones for a state.
+ *
+ * @param string $state open|closed
+ */
+ public function countMilestones($state)
+ {
+ return $this->countForProjectWithStatus($state);
+ }
+
+ /**
+ * Find milestone for Id.
+ *
+ * @param int $id
+ */
+ public function findMilestoneById($id)
+ {
+ $issueMilestone = $this->find($id);
+ if ($issueMilestone) {
+ if ($issueMilestone->getProject()->getId() !== $this->getProject()->getId()) {
+ throw new AccessDeniedException('Milestones project id is different to request project Id');
+ }
+ }
+
+ return $issueMilestone;
+ }
+
+ /**
+ * Gets a new Milestone entity.
+ *
+ * @return VersionControl\GitControlBundle\Entity\IssueMilestone
+ */
+ public function newMilestone()
+ {
+ $issueMilestoneEntity = new IssueMilestone();
+
+ return $issueMilestoneEntity;
+ }
+
+ /**
+ * @param VersionControl\GitControlBundle\Entity\IssueMilestone $issueMilestone
+ */
+ public function createMilestone($issueMilestone)
+ {
+ $em = $this->getEntityManager();
+
+ //Set User
+ $issueMilestone->setVerUser($this->currentUser);
+ //Set Project
+ $issueMilestone->setProject($this->project);
+
+ $em->persist($issueMilestone);
+ $em->flush();
+
+ return $issueMilestone;
+ }
+
+ /**
+ * @param VersionControl\GitControlBundle\Entity\IssueMilestone $issueMilestone
+ */
+ public function updateMilestone($issueMilestone)
+ {
+ if ($issueMilestone->getProject()->getId() !== $this->getProject()->getId()) {
+ throw new AccessDeniedException('Milestones project id is different to request project Id');
+ }
+
+ $em = $this->getEntityManager();
+ $em->flush();
+
+ return $issueMilestone;
+ }
+
+ /**
+ * @param int $issueMilestoneId
+ */
+ public function deleteMilestone($id)
+ {
+ $em = $this->getEntityManager();
+ $issueMilestone = $this->findMilestoneById($id);
+ if ($issueMilestone) {
+ $em->remove($issueMilestone);
+ $em->flush();
+ }
+ }
+
+ /**
+ * @param int $id
+ */
+ public function reOpenMilestone($id)
+ {
+ $em = $this->getEntityManager();
+ $issueMilestone = $this->findMilestoneById($id);
+ if ($issueMilestone) {
+ $issueMilestone->setOpen();
+ $em->flush();
+ }
+
+ return $issueMilestone;
+ }
+
+ /**
+ * @param int $id
+ */
+ public function closeMilestone($id)
+ {
+ $em = $this->getEntityManager();
+ $issueMilestone = $this->findMilestoneById($id);
+ if ($issueMilestone) {
+ $issueMilestone->setClosed();
+ $em->flush();
+ }
+
+ return $issueMilestone;
+ }
+
+ /**
+ * @param type $project
+ *
+ * @return int
+ */
+ public function countForProjectWithStatus($status = 'open')
+ {
+ $qb = $this->findByProjectAndStatus($status, true);
+
+ $qb->select('count(a)');
+
+ return $qb->getQuery()->getSingleScalarResult();
+ }
+
+ public function findByProjectAndStatus($status = 'open', $queryOnly = false)
+ {
+ $em = $this->getEntityManager();
+ $qb = $em->createQueryBuilder();
+
+ $where = 'a.project = :project';
+ $parameters = array('project' => $this->project);
+
+ $qb->select('a')
+ ->from('VersionControlGitControlBundle:IssueMilestone', 'a')
+ ->where($where)
+ ->setParameters($parameters);
+
+ if ($status) {
+ $qb->andWhere(
+ $qb->expr()->like('a.state', ':status')
+ )->setParameter('status', $status);
+ }
+
+ if ($queryOnly === true) {
+ return $qb;
+ } else {
+ return $qb->getQuery()->getResult();
+ }
+ }
+}
diff --git a/app/src/VersionControl/GitControlBundle/Repository/IssueRepository.php b/app/src/VersionControl/GitControlBundle/Repository/IssueRepository.php
new file mode 100644
index 0000000..c534f47
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Repository/IssueRepository.php
@@ -0,0 +1,257 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+use VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryInterface;
+use VersionControl\GitControlBundle\Entity\Issue;
+use VersionControl\GitControlBundle\Entity\IssueComment;
+
+class IssueRepository extends EntityRepository implements IssueRepositoryInterface
+{
+ protected $project;
+
+ protected $currentUser;
+
+ /**
+ * Finds issues for a state.
+ *
+ * @param string $keyword
+ *
+ * @return array of issues
+ */
+ public function findIssues($keyword, $state = 'open')
+ {
+ return $this->findByProjectAndStatus($state, $keyword, null, true);
+ }
+
+ /**
+ * Finds issues for a state.
+ *
+ * @param string $keyword
+ *
+ * @return array of issues
+ */
+ public function countFindIssues($keyword, $state = 'open')
+ {
+ return $this->countIssuesForProjectWithStatus($state, $keyword);
+ }
+
+ /**
+ * @param int $id
+ */
+ public function findIssueById($id)
+ {
+ $issueEntity = $this->find($id);
+
+ if (!$issueEntity) {
+ throw $this->createNotFoundException('Unable to find Issue entity.');
+ }
+
+ return $issueEntity;
+ }
+
+ /**
+ * @param type $issue
+ */
+ public function newIssue()
+ {
+ $issueEntity = new Issue();
+ $issueEntity->setProject($this->project);
+
+ return $issueEntity;
+ }
+
+ /**
+ * @param type $issue
+ */
+ public function newIssueComment()
+ {
+ $issueComment = new IssueComment();
+ //$issueComment->setProject($this->project);
+ return $issueComment;
+ }
+
+ public function createIssueComment($issueComment)
+ {
+ $em = $this->getEntityManager();
+
+ //Set User
+ $issueComment->setVerUser($this->currentUser);
+ $em->persist($issueComment);
+ $em->flush();
+
+ return $issueComment;
+ }
+
+ /**
+ * @param type $issueEntity
+ */
+ public function createIssue($issueEntity)
+ {
+ $em = $this->getEntityManager();
+ $issueEntity->setProject($this->project);
+
+ //Set User
+ $issueEntity->setVerUser($this->currentUser);
+
+ $em->persist($issueEntity);
+ $em->flush();
+
+ return $issueEntity;
+ }
+
+ /**
+ * @param int $id
+ */
+ public function reOpenIssue($id)
+ {
+ $issueEntity = $this->find($id);
+ if ($issueEntity) {
+ $issueEntity->setOpen();
+
+ $em = $this->getEntityManager();
+ $em->flush();
+ }
+
+ return $issueEntity;
+ }
+
+ /**
+ * @param int $id
+ */
+ public function closeIssue($id)
+ {
+ $issueEntity = $this->find($id);
+ if ($issueEntity) {
+ $issueEntity->setClosed();
+
+ $em = $this->getEntityManager();
+ $em->flush();
+ }
+
+ return $issueEntity;
+ }
+
+ /**
+ * @param int $issue
+ */
+ public function updateIssue($issueEntity)
+ {
+ $em = $this->getEntityManager();
+
+ $em->flush();
+ }
+
+ /**
+ * Gets the number of Issues for a milestone by state.
+ *
+ * @param int $issueMilestoneId
+ * @param string $state open|closed|blank
+ */
+ public function countIssuesInMilestones($issueMilestoneId, $state)
+ {
+ return $this->countIssuesForProjectWithStatus($state, false, $issueMilestoneId);
+ }
+
+ /**
+ * Find issues in milestone.
+ *
+ * @param int $issueMilestoneId
+ * @param string $state open|closed|blank
+ * @param string $keyword Search string
+ */
+ public function findIssuesInMilestones($issueMilestoneId, $state, $keyword = false)
+ {
+ return $this->findByProjectAndStatus($state, $keyword, $issueMilestoneId, true);
+ }
+
+ /**
+ * @param type $project
+ *
+ * @return int
+ */
+ public function countIssuesForProjectWithStatus($status = 'open', $keyword = false, $milestone = null)
+ {
+ $qb = $this->findByProjectAndStatus($status, $keyword, $milestone, true);
+
+ $qb->select('count(a)');
+
+ return $qb->getQuery()->getSingleScalarResult();
+ }
+
+ public function findByProjectAndStatus($status = 'open', $keyword = false, $milestone = null, $queryOnly = false)
+ {
+ $em = $this->getEntityManager();
+ $qb = $em->createQueryBuilder();
+
+ $where = 'a.project = :project';
+ $parameters = array('project' => $this->project);
+
+ $qb->select('a')
+ ->from('VersionControlGitControlBundle:Issue', 'a')
+ ->where($where)
+ ->setParameters($parameters);
+
+ if ($status) {
+ $qb->andWhere(
+ $qb->expr()->like('a.status', ':status')
+ )->setParameter('status', $status);
+ }
+ //If keyword is set
+ if ($keyword) {
+ $qb->andWhere(
+ $qb->expr()->orX(
+ $qb->expr()->like('a.title', ':keyword'),
+ $qb->expr()->like('a.description', ':keyword')
+ )
+ )->setParameter('keyword', '%'.$keyword.'%');
+ }
+
+ if ($milestone != null) {
+ $qb->andWhere(
+ $qb->expr()->eq('a.issueMilestone', ':milestone')
+ )->setParameter('milestone', $milestone);
+ }
+
+ $qb->orderBy('a.updatedAt', 'desc');
+
+ if ($queryOnly === true) {
+ return $qb;
+ } else {
+ return $qb->getQuery()->getResult();
+ }
+ }
+
+ public function getProject()
+ {
+ return $this->project;
+ }
+
+ public function setProject($project)
+ {
+ $this->project = $project;
+
+ return $this;
+ }
+
+ public function getCurrentUser()
+ {
+ return $this->currentUser;
+ }
+
+ public function setCurrentUser($currentUser)
+ {
+ $this->currentUser = $currentUser;
+
+ return $this;
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Repository/Issues/IssueLabelRepositoryInterface.php b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueLabelRepositoryInterface.php
similarity index 75%
rename from src/VersionControl/GitControlBundle/Repository/Issues/IssueLabelRepositoryInterface.php
rename to app/src/VersionControl/GitControlBundle/Repository/Issues/IssueLabelRepositoryInterface.php
index 9f40ab3..8162b0f 100644
--- a/src/VersionControl/GitControlBundle/Repository/Issues/IssueLabelRepositoryInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueLabelRepositoryInterface.php
@@ -7,51 +7,46 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Repository\Issues;
-
+namespace VersionControl\GitControlBundle\Repository\Issues;
-interface IssueLabelRepositoryInterface{
-
+interface IssueLabelRepositoryInterface
+{
/**
- * Finds issues for a state
+ * Finds issues for a state.
+ *
* @param string $keyword
+ *
* @return array of issues
*/
public function listLabels();
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function findLabelById($id);
-
+
/**
- * Gets a new Label entity
+ * Gets a new Label entity.
+ *
* @param type $issue
+ *
* @return VersionControl\GitControlBundle\Entity\Labels\Label
*/
public function newLabel();
-
+
/**
- *
* @param type $issue
*/
public function createLabel($issueLabel);
-
/**
- *
- * @param integer $issue
+ * @param int $issue
*/
public function updateLabel($issueLabel);
-
+
/**
- *
- * @param integer $issueLabelId
+ * @param int $issueLabelId
*/
public function deleteLabel($issueLabelId);
-
-
}
-
diff --git a/src/VersionControl/GitControlBundle/Repository/Issues/IssueMilestoneRepositoryInterface.php b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueMilestoneRepositoryInterface.php
similarity index 71%
rename from src/VersionControl/GitControlBundle/Repository/Issues/IssueMilestoneRepositoryInterface.php
rename to app/src/VersionControl/GitControlBundle/Repository/Issues/IssueMilestoneRepositoryInterface.php
index 7b096ed..90ab840 100644
--- a/src/VersionControl/GitControlBundle/Repository/Issues/IssueMilestoneRepositoryInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueMilestoneRepositoryInterface.php
@@ -7,70 +7,63 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Repository\Issues;
-
+namespace VersionControl\GitControlBundle\Repository\Issues;
-interface IssueMilestoneRepositoryInterface{
-
+interface IssueMilestoneRepositoryInterface
+{
/**
- * Finds all milestones
+ * Finds all milestones.
+ *
* @param string $state open|closed
+ *
* @return array of issues
*/
public function listMilestones($state);
-
+
/**
- * Get number of milestones for a state
+ * Get number of milestones for a state.
+ *
* @param string $state open|closed
*/
public function countMilestones($state);
-
-
-
+
/**
- * Find milestone for Id
- * @param integer $id
+ * Find milestone for Id.
+ *
+ * @param int $id
*/
public function findMilestoneById($id);
-
+
/**
- * Gets a new Milestone entity
- *
+ * Gets a new Milestone entity.
+ *
* @return VersionControl\GitControlBundle\Entity\Milestones\MilestoneInterface
*/
public function newMilestone();
-
+
/**
- *
* @param type $issueMilestone
*/
public function createMilestone($issueMilestone);
-
/**
- *
- * @param integer $issueMilestone
+ * @param int $issueMilestone
*/
public function updateMilestone($issueMilestone);
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function deleteMilestone($id);
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function reOpenMilestone($id);
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function closeMilestone($id);
-
}
-
diff --git a/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryInterface.php b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryInterface.php
similarity index 50%
rename from src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryInterface.php
rename to app/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryInterface.php
index d69e06a..d406c37 100644
--- a/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryInterface.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryInterface.php
@@ -7,77 +7,76 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Repository\Issues;
-
+namespace VersionControl\GitControlBundle\Repository\Issues;
-interface IssueRepositoryInterface{
-
+interface IssueRepositoryInterface
+{
/**
- * Finds issues for a state
+ * Finds issues for a state.
+ *
* @param string $keyword
+ *
* @return array of issues
*/
- public function findIssues($keyword,$state="open");
-
+ public function findIssues($keyword, $state = 'open');
+
/**
- * Count number of issues by $state and $keyword
+ * Count number of issues by $state and $keyword.
+ *
* @param string $keyword
* @param string $state
*/
- public function countFindIssues($keyword,$state="open");
-
+ public function countFindIssues($keyword, $state = 'open');
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function findIssueById($id);
-
+
/**
- * Gets a new Issue entity
+ * Gets a new Issue entity.
+ *
* @param type $issue
+ *
* @return VersionControl\GitControlBundle\Entity\Issues\Issue
*/
public function newIssue();
-
+
/**
- *
* @param type $issue
*/
public function createIssue($issue);
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function reOpenIssue($id);
-
+
/**
- *
- * @param integer $id
+ * @param int $id
*/
public function closeIssue($id);
-
+
/**
- *
- * @param integer $issue
+ * @param int $issue
*/
public function updateIssue($issue);
-
+
/**
- * Gets the number of Issues for a milestone by state
- * @param integer $issueMilestoneId
- * @param string $state open|closed|blank
+ * Gets the number of Issues for a milestone by state.
+ *
+ * @param int $issueMilestoneId
+ * @param string $state open|closed|blank
*/
- public function countIssuesInMilestones($issueMilestoneId,$state);
-
+ public function countIssuesInMilestones($issueMilestoneId, $state);
+
/**
- * Find issues in milestone
- * @param integer $issueMilestoneId
- * @param string $state open|closed
- * @param string $keyword Search string
+ * Find issues in milestone.
+ *
+ * @param int $issueMilestoneId
+ * @param string $state open|closed
+ * @param string $keyword Search string
*/
- public function findIssuesInMilestones($issueMilestoneId,$state,$keyword = false);
-
+ public function findIssuesInMilestones($issueMilestoneId, $state, $keyword = false);
}
-
diff --git a/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryManager.php b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryManager.php
similarity index 62%
rename from src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryManager.php
rename to app/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryManager.php
index a41b670..4ad4823 100644
--- a/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryManager.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/Issues/IssueRepositoryManager.php
@@ -7,9 +7,8 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-namespace VersionControl\GitControlBundle\Repository\Issues;
-use VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator;
+namespace VersionControl\GitControlBundle\Repository\Issues;
use VersionControl\GitControlBundle\Form\IssueType;
use VersionControl\GitControlBundle\Form\IssueEditType;
@@ -18,42 +17,39 @@
use VersionControl\GitControlBundle\Form\IssueMilestoneType;
/**
- * Description of IssueRepositoryManager
+ * Description of IssueRepositoryManager.
*
* @author paul
*/
-class IssueRepositoryManager {
-
+class IssueRepositoryManager
+{
/**
- *
- * @var \VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator
+ * @var \VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator
*/
protected $issueIntegrator;
-
+
protected $em;
-
+
protected $project;
-
- protected $securityToken;
-
- protected $serviceContainer;
+ protected $securityToken;
- public function __construct($securityToken, $em, $serviceContainer) {
+ protected $serviceContainer;
- $this->securityToken= $securityToken;
+ public function __construct($securityToken, $em, $serviceContainer)
+ {
+ $this->securityToken = $securityToken;
$this->em = $em;
- $this->serviceContainer= $serviceContainer;
-
+ $this->serviceContainer = $serviceContainer;
}
-
- public function getIssueRepository(){
- if($this->issueIntegrator){
+ public function getIssueRepository()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
$issueRepository = $this->serviceContainer->get('version_control.issue_repository.'.strtolower($repoType));
$issueRepository->setIssueIntegrator($this->issueIntegrator);
- }else{
+ } else {
//Default ORM repository
$issueRepository = $this->em->getRepository('VersionControlGitControlBundle:Issue');
$issueRepository->setProject($this->project);
@@ -61,34 +57,35 @@ public function getIssueRepository(){
$user = $this->securityToken->getToken()->getUser();
$issueRepository->setCurrentUser($user);
}
-
+
return $issueRepository;
}
-
- public function getIssueLabelRepository(){
- if($this->issueIntegrator){
+
+ public function getIssueLabelRepository()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
$issueLabelRepository = $this->serviceContainer->get('version_control.issue_label_repository.'.strtolower($repoType));
$issueLabelRepository->setIssueIntegrator($this->issueIntegrator);
- }else{
+ } else {
//Default ORM repository
$issueLabelRepository = $this->em->getRepository('VersionControlGitControlBundle:IssueLabel');
$issueLabelRepository->setProject($this->project);
//Set User
$user = $this->securityToken->getToken()->getUser();
$issueLabelRepository->setCurrentUser($user);
-
}
-
+
return $issueLabelRepository;
}
-
- public function getIssueMilestoneRepository(){
- if($this->issueIntegrator){
+
+ public function getIssueMilestoneRepository()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
$issueMilestoneRepository = $this->serviceContainer->get('version_control.issue_milestone_repository.'.strtolower($repoType));
$issueMilestoneRepository->setIssueIntegrator($this->issueIntegrator);
- }else{
+ } else {
//Default ORM repository
$issueMilestoneRepository = $this->em->getRepository('VersionControlGitControlBundle:IssueMilestone');
$issueMilestoneRepository->setProject($this->project);
@@ -96,81 +93,95 @@ public function getIssueMilestoneRepository(){
$user = $this->securityToken->getToken()->getUser();
$issueMilestoneRepository->setCurrentUser($user);
}
-
+
return $issueMilestoneRepository;
}
-
- public function getIssueIntegrator() {
+
+ public function getIssueIntegrator()
+ {
return $this->issueIntegrator;
}
- public function setIssueIntegrator(\VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator $issueIntegrator) {
+ public function setIssueIntegrator(\VersionControl\GitControlBundle\Entity\ProjectIssueIntegrator $issueIntegrator)
+ {
$this->issueIntegrator = $issueIntegrator;
$this->project = $issueIntegrator->getProject();
+
return $this;
}
-
- public function getProject() {
+
+ public function getProject()
+ {
return $this->project;
}
- public function setProject($project) {
+ public function setProject($project)
+ {
$this->project = $project;
+
return $this;
}
-
- public function getIssueFormType(){
- if($this->issueIntegrator){
+ public function getIssueFormType()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
- $issueFormType = $this->serviceContainer->get('version_control.issue_form_type.'.strtolower($repoType));
- }else{
- $issueFormType = new IssueType($this);
+ $issueFormType = 'VersionControl\\'.$repoType.'IssueBundle\Form\IssueType';
+ } else {
+ $issueFormType = IssueType::class;
}
+
return $issueFormType;
}
-
- public function getIssueEditFormType(){
- if($this->issueIntegrator){
+ public function getIssueEditFormType()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
- $issueEditFormType = $this->serviceContainer->get('version_control.issue_form_edit_type.'.strtolower($repoType));
- }else{
- $issueEditFormType = new IssueEditType($this);
+ $issueEditFormType = 'VersionControl\\'.$repoType."IssueBundle\Form\IssueEditType";
+ } else {
+ $issueEditFormType = IssueEditType::class;
}
-
+
return $issueEditFormType;
}
-
- public function getIssueCommentFormType(){
- if($this->issueIntegrator){
+
+ public function getIssueCommentFormType()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
- $issueFormType = $this->serviceContainer->get('version_control.issue_comment_form_type.'.strtolower($repoType));
- }else{
- $issueFormType = new IssueCommentType($this);
+ //$issueFormType = $this->serviceContainer->get("version_control.issue_comment_form_type.'.strtolower($repoType));
+ $issueFormType = 'VersionControl\\'.$repoType.'IssueBundle\Form\IssueCommentType';
+ } else {
+ $issueFormType = IssueCommentType::class;
}
+
return $issueFormType;
}
-
- public function getIssueLabelFormType(){
- if($this->issueIntegrator){
+
+ public function getIssueLabelFormType()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
- $issueFormType = $this->serviceContainer->get('version_control.issue_label_form_type.'.strtolower($repoType));
- }else{
- $issueFormType = new IssueLabelType($this);
+ //$issueFormType = $this->serviceContainer->get('version_control.issue_label_form_type.'.strtolower($repoType));
+ $issueFormType = 'VersionControl\\'.$repoType.'IssueBundle\Form\IssueLabelType';
+ } else {
+ $issueFormType = IssueLabelType::class;
}
+
return $issueFormType;
}
-
- public function getIssueMilestoneFormType(){
- if($this->issueIntegrator){
+
+ public function getIssueMilestoneFormType()
+ {
+ if ($this->issueIntegrator) {
$repoType = $this->issueIntegrator->getRepoType();
- $issueFormType = $this->serviceContainer->get('version_control.issue_milestone_form_type.'.strtolower($repoType));
- }else{
- $issueFormType = new IssueMilestoneType($this);
+ //$issueFormType = $this->serviceContainer->get('version_control.issue_milestone_form_type.'.strtolower($repoType));
+ $issueFormType = 'VersionControl\\'.$repoType.'IssueBundle\Form\IssueMilestoneType';
+ } else {
+ $issueFormType = IssueMilestoneType::class;
}
+
return $issueFormType;
}
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentFilePermRepository.php b/app/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentFilePermRepository.php
similarity index 83%
rename from src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentFilePermRepository.php
rename to app/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentFilePermRepository.php
index d14795f..d30ac01 100644
--- a/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentFilePermRepository.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentFilePermRepository.php
@@ -7,12 +7,11 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Repository;
use Doctrine\ORM\EntityRepository;
-class ProjectEnvironmentRepository extends EntityRepository
+class ProjectEnvironmentFilePermRepository extends EntityRepository
{
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentRepository.php b/app/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentRepository.php
similarity index 98%
rename from src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentRepository.php
rename to app/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentRepository.php
index d14795f..835d21c 100644
--- a/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentRepository.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/ProjectEnvironmentRepository.php
@@ -7,12 +7,11 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Repository;
use Doctrine\ORM\EntityRepository;
class ProjectEnvironmentRepository extends EntityRepository
{
-
-
}
diff --git a/src/VersionControl/GitControlBundle/Repository/ProjectIssueIntegratorRepository.php b/app/src/VersionControl/GitControlBundle/Repository/ProjectIssueIntegratorRepository.php
similarity index 98%
rename from src/VersionControl/GitControlBundle/Repository/ProjectIssueIntegratorRepository.php
rename to app/src/VersionControl/GitControlBundle/Repository/ProjectIssueIntegratorRepository.php
index 4c8c584..90a17a5 100644
--- a/src/VersionControl/GitControlBundle/Repository/ProjectIssueIntegratorRepository.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/ProjectIssueIntegratorRepository.php
@@ -7,12 +7,11 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Repository;
use Doctrine\ORM\EntityRepository;
class ProjectIssueIntegratorRepository extends EntityRepository
{
-
-
}
diff --git a/app/src/VersionControl/GitControlBundle/Repository/ProjectRepository.php b/app/src/VersionControl/GitControlBundle/Repository/ProjectRepository.php
new file mode 100644
index 0000000..12e11bc
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Repository/ProjectRepository.php
@@ -0,0 +1,37 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace VersionControl\GitControlBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+class ProjectRepository extends EntityRepository
+{
+ public function findByKeyword($keyword = false, $queryOnly = false)
+ {
+ $em = $this->getEntityManager();
+ $qb = $em->createQueryBuilder();
+
+ $qb->select('a')
+ ->from('VersionControlGitControlBundle:Project', 'a');
+
+ //If keyword is set
+ if ($keyword) {
+ $qb->andWhere('a.title LIKE :keyword OR a.title LIKE :keyword')
+ ->setParameter('keyword', '%'.$keyword.'%');
+ }
+
+ if ($queryOnly === true) {
+ return $qb;
+ } else {
+ return $qb->getQuery()->getResult();
+ }
+ }
+}
diff --git a/src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php b/app/src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php
similarity index 57%
rename from src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php
rename to app/src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php
index 7978acd..78e4f08 100644
--- a/src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php
+++ b/app/src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php
@@ -7,37 +7,34 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
+
namespace VersionControl\GitControlBundle\Repository;
use Doctrine\ORM\EntityRepository;
class UserProjectsRepository extends EntityRepository
{
+ public function findByUserAndKeyword($user, $keyword = false, $queryOnly = false)
+ {
+ $em = $this->getEntityManager();
+ $qb = $em->createQueryBuilder();
- public function findByUserAndKeyword($user, $keyword = false,$queryOnly= false){
- $em=$this->getEntityManager();
- $qb = $em->createQueryBuilder();
-
-
- $qb->select('a')
- ->from('VersionControlGitControlBundle:UserProjects','a')
+ $qb->select('a')
+ ->from('VersionControlGitControlBundle:UserProjects', 'a')
->leftJoin('a.project', 'b')
->where('a.user = :user')
->setParameter('user', $user);
-
-
- //If keyword is set
- if($keyword){
- $qb->andWhere(' b.title LIKE :keyword OR b.description LIKE :keyword ')
+ //If keyword is set
+ if ($keyword) {
+ $qb->andWhere(' b.title LIKE :keyword OR b.description LIKE :keyword ')
->setParameter('keyword', '%'.$keyword.'%');
}
-
- if($queryOnly === true){
- return $qb;
- }else{
- return $qb->getQuery()->getResult();
- }
-
- }
+
+ if ($queryOnly === true) {
+ return $qb;
+ } else {
+ return $qb->getQuery()->getResult();
+ }
+ }
}
diff --git a/app/src/VersionControl/GitControlBundle/Resources/config/gitservices.yml b/app/src/VersionControl/GitControlBundle/Resources/config/gitservices.yml
new file mode 100644
index 0000000..fca5f2f
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Resources/config/gitservices.yml
@@ -0,0 +1,32 @@
+
+services:
+ version_control.ssh_process:
+ class: VersionControl\GitControlBundle\Utility\SshProcess
+
+ version_control.gitcommand_collector:
+ class: VersionControl\GitControlBundle\Profiler\GitCommandCollector
+ tags:
+ -
+ name: data_collector
+ template: 'VersionControlGitControlBundle:Profiler:GitCommand.html.twig'
+ id: 'version_control.gitcommand_collector'
+ #priority: 300
+ public: false
+ arguments:
+ - '@version_control.logger'
+
+
+ version_control.logger:
+ class: VersionControl\GitControlBundle\Logger\GitCommandLogger
+ arguments:
+ - '@logger'
+ - %kernel.debug%
+ tags:
+ - { name: monolog.logger, channel: 'gitcommand' }
+
+ version_control.issue_repository_manager:
+ class: VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryManager
+ arguments:
+ - '@security.token_storage'
+ - '@doctrine.orm.entity_manager'
+ - '@service_container'
diff --git a/src/VersionControl/GitControlBundle/Resources/config/services.yml b/app/src/VersionControl/GitControlBundle/Resources/config/services.yml
similarity index 72%
rename from src/VersionControl/GitControlBundle/Resources/config/services.yml
rename to app/src/VersionControl/GitControlBundle/Resources/config/services.yml
index b0a35ec..77e8f72 100644
--- a/src/VersionControl/GitControlBundle/Resources/config/services.yml
+++ b/app/src/VersionControl/GitControlBundle/Resources/config/services.yml
@@ -1,13 +1,13 @@
## YAML Template.
#imports:
# - { resource: gitservices.yml }
-
+
services:
-
-
+
+
version_control.subscriberACL:
class: VersionControl\GitControlBundle\EventListener\ProjectAccessControlList
- arguments: [@service_container]
+ arguments: ['@service_container']
tags:
- { name: doctrine.event_subscriber }
@@ -15,124 +15,124 @@ services:
class: VersionControl\GitControlBundle\Form\RegistrationType
tags:
- { name: form.type, alias: version_control_user_registration }
-
-
+
+
version_control.twig.versioncontrol_textcolor:
class: VersionControl\GitControlBundle\Twig\Extension\TextColorExtension
tags:
- { name: twig.extension }
-
+
version_control.project_environmnent_storage:
class: VersionControl\GitControlBundle\Utility\ProjectEnvironmentStorage
arguments:
- - @session
- - @doctrine.orm.entity_manager
-
+ - '@session'
+ - '@doctrine.orm.entity_manager'
+
version_control.twig.versioncontrol_project_environmnent_storage:
class: VersionControl\GitControlBundle\Twig\Extension\ProjectEnvironmnentStorageExtension
tags:
- { name: twig.extension }
arguments:
- - @version_control.project_environmnent_storage
-
+ - '@version_control.project_environmnent_storage'
+
version_control.twig.versioncontrol_parentdirectory:
class: VersionControl\GitControlBundle\Twig\Extension\ParentDirectoryExtension
tags:
- - { name: twig.extension }
-
-
+ - { name: twig.extension }
+
+
version_control.twig.versioncontrol_pagination:
class: VersionControl\GitControlBundle\Twig\Extension\PaginationExtension
tags:
- { name: twig.extension }
arguments:
- - @router
- - @request_stack
-
+ - '@router'
+ - '@request_stack'
+
version_control.issue_repository_manager:
class: VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryManager
arguments:
- - @security.token_storage
- - @doctrine.orm.entity_manager
- - @service_container
-
+ - '@security.token_storage'
+ - '@doctrine.orm.entity_manager'
+ - '@service_container'
+
version_control.twig.versioncontrol_issuelink:
class: VersionControl\GitControlBundle\Twig\Extension\IssueLinkExtension
tags:
- { name: twig.extension }
arguments:
- - @router
-
+ - '@router'
+
version_control.twig.versioncontrol_commit_hash_link:
class: VersionControl\GitControlBundle\Twig\Extension\CommitHashLinkExtension
tags:
- { name: twig.extension }
arguments:
- - @router
-
+ - '@router'
+
version_control.twig.versioncontrol_issue_number_link:
class: VersionControl\GitControlBundle\Twig\Extension\IssueNumberLinkExtension
tags:
- { name: twig.extension }
arguments:
- - @router
-
+ - '@router'
+
version_control.beforecontoller.action_listener:
class: VersionControl\GitControlBundle\EventListener\ProjectEnviromentBeforeListener
- arguments:
- - @version_control.project_environmnent_storage
+ arguments:
+ - '@version_control.project_environmnent_storage'
tags:
- { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
-
+
version_control.gitalterfiles.listener:
class: VersionControl\GitControlBundle\EventListener\GitAlterFilesEventListener
- arguments:
- - @version_control.git_commands
+ arguments:
+ - '@version_control.git_commands'
tags:
- { name: kernel.event_listener, event: git.alter_files, method: changeFilePermissions }
-
+
version_control.validator.ssh_details_validator:
class: VersionControl\GitControlBundle\Validator\Constraints\SshDetailsValidator
tags:
- { name: validator.constraint_validator, alias: ssh_details_validator }
- arguments:
- - @version_control.sftp_process
-
+ arguments:
+ - '@version_control.sftp_process'
+
version_control.api_user_provider:
class: VersionControl\GitControlBundle\Security\Authentication\FOSVersionUserProvider
#this is the place where the properties are passed to the UserProvider - see config.yml
- arguments:
- - @fos_user.user_manager
+ arguments:
+ - '@fos_user.user_manager'
- {github:githubId}
-
+
version_control.validator.status_hash_validator:
class: VersionControl\GitControlBundle\Validator\Constraints\StatusHashValidator
tags:
- { name: validator.constraint_validator, alias: status_hash_validator }
- arguments:
- - @version_control.git_commands
- - @version_control.project_environmnent_storage
-
+ arguments:
+ - '@version_control.git_commands'
+ - '@version_control.project_environmnent_storage'
+
version_control.form.field.entity_hidden:
class: VersionControl\GitControlBundle\Form\Field\EntityHiddenType
arguments: ["@doctrine.orm.entity_manager"]
tags:
- { name: form.type, alias: entity_hidden }
-
+
version_control.validator.git_folder_exists_validator:
class: VersionControl\GitControlBundle\Validator\Constraints\GitFolderExistsValidator
tags:
- { name: validator.constraint_validator, alias: git_folder_exists_validator }
- arguments:
- - @version_control.sftp_process
-
+ arguments:
+ - '@version_control.sftp_process'
+
version_control.validator.git_folder_not_exists_validator:
class: VersionControl\GitControlBundle\Validator\Constraints\GitFolderNotExistsValidator
tags:
- { name: validator.constraint_validator, alias: git_folder_not_exists_validator }
- arguments:
- - @version_control.ssh_process
-
+ arguments:
+ - '@version_control.sftp_process'
+
version_control.listener.doctrine_event_listener:
class: VersionControl\GitControlBundle\EventListener\DoctrineEventListener
@@ -143,22 +143,38 @@ services:
version_control.project_access_annotation_driver:
class: VersionControl\GitControlBundle\Annotation\Driver\ProjectAccessAnnotationDriver #Point class
tags: [{name: kernel.event_listener, event: kernel.controller, method: onKernelController}]
- arguments: [@annotation_reader]
-
+ arguments: ['@annotation_reader']
+
version_control.installer.db_install:
class: VersionControl\GitControlBundle\Installer\DatabaseInstall
- arguments: [@database_connection]
+ arguments: ['@database_connection']
tags:
- {name: version_control.installer, type: initaldb}
-
+
version_control.installer_command:
class: VersionControl\GitControlBundle\Command\InstallerCommand
arguments:
- - @database_connection
- - @version_control.installer.db_install
- - @cache_clearer
- - @filesystem
+ - '@database_connection'
+ - '@version_control.installer.db_install'
+ - '@cache_clearer'
+ - '@filesystem'
- %kernel.cache_dir%
- %kernel.environment%
+ - '@fos_user.user_manager'
tags:
- - { name: console.command }
\ No newline at end of file
+ - { name: console.command }
+
+ version_control.security.git_user:
+ class: VersionControl\GitControlBundle\Security\GitUserFactory
+ arguments:
+ - "@security.token_storage"
+
+ version_control.git_commands:
+ class: VersionControl\GitCommandBundle\GitCommands\GitCommand
+ calls:
+ - [setGitUser, ["@version_control.security.git_user"]]
+ - [setDispatcher, ["@event_dispatcher"]]
+ - [setLogger, ["@version_control.logger"]]
+ - [setSshProcess, ["@version_control.ssh_process"]]
+ - [setSftpProcess, ["@version_control.sftp_process"]]
+ - [setCache, ["@array_cache"]]
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css.map b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css.map
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.css.map
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/css/bootstrap.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.eot b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.svg b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.ttf b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.js b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/bootstrap.min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/npm.js b/app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/npm.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/npm.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/bootstrap/js/npm.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.css b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/css/font-awesome.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/FontAwesome.otf b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/FontAwesome.otf
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/FontAwesome.otf
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.eot b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.eot
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.svg b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.svg
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.ttf b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.ttf
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff2 b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff2
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/animated.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/animated.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/animated.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/animated.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/bordered-pulled.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/bordered-pulled.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/bordered-pulled.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/bordered-pulled.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/core.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/core.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/core.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/core.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/fixed-width.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/fixed-width.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/fixed-width.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/fixed-width.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/font-awesome.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/font-awesome.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/font-awesome.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/font-awesome.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/icons.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/icons.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/icons.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/icons.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/larger.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/larger.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/larger.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/larger.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/list.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/list.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/list.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/list.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/mixins.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/mixins.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/mixins.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/mixins.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/path.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/path.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/path.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/path.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/rotated-flipped.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/rotated-flipped.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/rotated-flipped.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/rotated-flipped.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/spinning.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/spinning.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/spinning.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/spinning.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/stacked.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/stacked.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/stacked.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/stacked.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/variables.less b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/variables.less
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/variables.less
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/less/variables.less
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_animated.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_animated.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_animated.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_animated.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_bordered-pulled.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_bordered-pulled.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_bordered-pulled.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_bordered-pulled.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_core.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_core.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_core.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_core.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_fixed-width.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_fixed-width.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_fixed-width.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_fixed-width.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_icons.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_icons.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_icons.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_icons.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_larger.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_larger.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_larger.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_larger.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_list.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_list.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_list.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_list.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_mixins.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_mixins.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_mixins.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_mixins.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_path.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_path.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_path.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_path.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_rotated-flipped.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_rotated-flipped.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_rotated-flipped.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_rotated-flipped.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_spinning.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_spinning.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_spinning.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_spinning.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_stacked.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_stacked.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_stacked.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_stacked.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_variables.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_variables.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_variables.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/_variables.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/font-awesome.scss b/app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/font-awesome.scss
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/font-awesome.scss
rename to app/src/VersionControl/GitControlBundle/Resources/public/font-awesome/scss/font-awesome.scss
diff --git a/src/VersionControl/GitControlBundle/Resources/public/images/default_user_icon.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/images/default_user_icon.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/images/default_user_icon.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/images/default_user_icon.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/images/screenshot.png b/app/src/VersionControl/GitControlBundle/Resources/public/images/screenshot.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/images/screenshot.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/images/screenshot.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/ajaxifypage.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/ajaxifypage.js
similarity index 83%
rename from src/VersionControl/GitControlBundle/Resources/public/js/ajaxifypage.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/ajaxifypage.js
index 5f698a7..029ca67 100644
--- a/src/VersionControl/GitControlBundle/Resources/public/js/ajaxifypage.js
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/js/ajaxifypage.js
@@ -48,38 +48,39 @@ $(function(){
/* Ajaxify all Forms in container*/
$contentContainter.on('submit', 'form', function (e) {
+ if($(this).hasClass('ajaxify') == false){
+ e.preventDefault();
+ var loadingText = 'Submitting Form...';
+ if($(this).data('masklabel')){
+ loadingText = $(this).data('masklabel');
+ }
- e.preventDefault();
- var loadingText = 'Submitting Form...';
- if($(this).data('masklabel')){
- loadingText = $(this).data('masklabel');
- }
-
- //hide modals if open
- $(".modal.in").modal('hide');
+ //hide modals if open
+ $(".modal.in").modal('hide');
- $contentContainter.mask({label:loadingText});
- //loadUrl($(this).attr('action'));
- console.log(buttonClicked);
- var formData = $(this).serializeArray();
- formData.push( {'name':buttonClicked});
- $.ajax({
- type: $(this).attr('method'),
- url: $(this).attr('action'),
- data: formData,
- dataType: "html",
- success: function(data, textStatus, jqXHR) {
- $contentContainter.html(data);
- $contentContainter.unmask();
- console.log(textStatus);
- console.log(jqXHR);
- },
- error: function(e)
- {
- $contentContainter.html(e);
- $contentContainter.unmask();
- }
- });
+ $contentContainter.mask({label:loadingText});
+ //loadUrl($(this).attr('action'));
+ console.log(buttonClicked);
+ var formData = $(this).serializeArray();
+ formData.push( {'name':buttonClicked});
+ $.ajax({
+ type: $(this).attr('method'),
+ url: $(this).attr('action'),
+ data: formData,
+ dataType: "html",
+ success: function(data, textStatus, jqXHR) {
+ $contentContainter.html(data);
+ $contentContainter.unmask();
+ console.log(textStatus);
+ console.log(jqXHR);
+ },
+ error: function(e)
+ {
+ $contentContainter.html(e);
+ $contentContainter.unmask();
+ }
+ });
+ }
});
/**
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/app.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/app.js
similarity index 91%
rename from src/VersionControl/GitControlBundle/Resources/public/js/app.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/app.js
index 5394b62..4b1cd44 100644
--- a/src/VersionControl/GitControlBundle/Resources/public/js/app.js
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/js/app.js
@@ -2,6 +2,8 @@
$(function(){
+ GlobalModal.initModal();
+
$('body').on('click','#commit-select-all',function(){
$('.commit-file').prop( "checked", true );
});
@@ -226,5 +228,26 @@ $(function(){
$('#form_filter').val(filter);
})
+ /** Prevent default actions on any element with class prevent-default**/
+ $('body').on('click','.prevent-default',function(e){
+ e.preventDefault();
+ });
+
+ //initSortable: function (formId) {
+ $(".ui-sortable").sortable({
+ items: ".item:not(.non-sortable)"
+ , stop: function (event, ui) {
+
+ //Update field values
+ $('.ui-sortable .item').each(function (index) {
+ var $input = $(this).find('input');
+ if ($input.val() != index) {
+ $input.val(index);
+ }
+ });
+ }
+ });
+ //}
+
});
\ No newline at end of file
diff --git a/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery-ui.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery-ui.min.css
new file mode 100644
index 0000000..4e20f03
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery-ui.min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.11.4 - 2016-06-15
+* http://jqueryui.com
+* Includes: core.css, sortable.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
diff --git a/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery-ui.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery-ui.min.js
new file mode 100644
index 0000000..8517685
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery-ui.min.js
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.11.4 - 2016-06-15
+* http://jqueryui.com
+* Includes: core.js, widget.js, mouse.js, sortable.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(e,s){var n,a,o,r=e.nodeName.toLowerCase();return"area"===r?(n=e.parentNode,a=n.name,e.href&&a&&"map"===n.nodeName.toLowerCase()?(o=t("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!e.disabled:"a"===r?e.href||s:s)&&i(e)}function i(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}t.ui=t.ui||{},t.extend(t.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({scrollParent:function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:t(this[0].ownerDocument||document)},uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])},focusable:function(i){return e(i,!isNaN(t.attr(i,"tabindex")))},tabbable:function(i){var s=t.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&e(i,!n)}}),t("").outerWidth(1).jquery||t.each(["Width","Height"],function(e,i){function s(e,i,s,a){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),a&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?o["inner"+i].call(this):this.each(function(){t(this).css(a,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?o["outer"+i].call(this,e):this.each(function(){t(this).css(a,s(this,e,!0,n)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t(" ").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(i){return arguments.length?e.call(this,t.camelCase(i)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.fn.extend({focus:function(e){return function(i,s){return"number"==typeof i?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),s&&s.call(e)},i)}):e.apply(this,arguments)}}(t.fn.focus),disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(e){if(void 0!==e)return this.css("zIndex",e);if(this.length)for(var i,s,n=t(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),t.ui.plugin={add:function(e,i,s){var n,a=t.ui[e].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,a=t.plugins[e];if(a&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)t.options[a[n][0]]&&a[n][1].apply(t.element,i)}};var s=0,n=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(o){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,a,o,r,h={},l=e.split(".")[0];return e=e.split(".")[1],n=l+"-"+e,s||(s=i,i=t.Widget),t.expr[":"][n.toLowerCase()]=function(e){return!!t.data(e,n)},t[l]=t[l]||{},a=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,a,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),r=new i,r.options=t.widget.extend({},r.options),t.each(s,function(e,s){return t.isFunction(s)?(h[e]=function(){var t=function(){return i.prototype[e].apply(this,arguments)},n=function(t){return i.prototype[e].apply(this,t)};return function(){var e,i=this._super,a=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=a,e}}(),void 0):(h[e]=s,void 0)}),o.prototype=t.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||e:e},h,{constructor:o,namespace:l,widgetName:e,widgetFullName:n}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,a=n.call(arguments,1),o=0,r=a.length;r>o;o++)for(i in a[o])s=a[o][i],a[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(a){var o="string"==typeof a,r=n.call(arguments,1),h=this;return o?this.each(function(){var i,n=t.data(this,s);return"instance"===a?(h=n,!1):n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(i=n[a].apply(n,r),i!==n&&void 0!==i?(h=i&&i.jquery?h.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+a+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+a+"'")}):(r.length&&(a=t.widget.extend.apply(null,[a].concat(r))),this.each(function(){var e=t.data(this,s);e?(e.option(a||{}),e._init&&e._init()):t.data(this,s,new i(a,this))})),h}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"",options:{disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=s++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,a,o=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(o={},s=e.split("."),e=s.shift(),s.length){for(n=o[e]=t.widget.extend({},this.options[e]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];o[e]=i}return this._setOptions(o),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!e),e&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(e,i,s){var n,a=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,o){function r(){return e||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(i).undelegate(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,a,o=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(t.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),o=!t.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){t(this)[e](),a&&a.call(s[0]),i()})}}),t.widget;var a=!1;t(document).mouseup(function(){a=!1}),t.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!a){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),a=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),a=!1,!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.11.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),t.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,a.widgetName+"-item")===a?(s=t(this),!1):void 0}),t.data(e.target,a.widgetName+"-item")===a&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=t("").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!o.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY
=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=t.left,o=a+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,u=this.offset.click.left,c="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+u>a&&o>e+u,p=c&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),s=e&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(a=t(l[s],this.document[0]),n=a.length-1;n>=0;n--)o=t.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([t.isFunction(o.options.items)?o.options.items.call(o.element):t(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,c=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)a=t.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(c.push([t.isFunction(a.options.items)?a.options.items.call(a.element[0],e,{item:this.currentItem}):t(a.options.items,a.element),a]),this.containers.push(a));for(i=c.length-1;i>=0;i--)for(o=c[i][1],r=c[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t(" ",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,a,o,r,h,l,u,c,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=d.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",c=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,e[c]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[c]-h)&&(n=Math.abs(e[c]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(e,a,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.width():this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])
+},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,a=e.pageX,o=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.leftthis.containment[2]&&(a=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})});
\ No newline at end of file
diff --git a/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery.ui.touch-punch.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery.ui.touch-punch.min.js
new file mode 100644
index 0000000..31272ce
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery-ui/jquery.ui.touch-punch.min.js
@@ -0,0 +1,11 @@
+/*!
+ * jQuery UI Touch Punch 0.2.3
+ *
+ * Copyright 2011–2014, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ * jquery.ui.widget.js
+ * jquery.ui.mouse.js
+ */
+!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);
\ No newline at end of file
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/jquery.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/jquery.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/jquery.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/jquery.js
diff --git a/app/src/VersionControl/GitControlBundle/Resources/public/js/modal.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/modal.js
new file mode 100644
index 0000000..9258983
--- /dev/null
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/js/modal.js
@@ -0,0 +1,107 @@
+var GlobalModal = function () {
+
+ return {
+
+ /**
+ * Makes a link open in a modal. Link must contain data-form-modal.
+ * If you want to set the header of modal add data-header="" to link
+ * It also ajaxify a form
+ *
+ * @returns {undefined}
+ */
+ initModal : function(){
+ var self = this;
+ //Sets Popup Modal for links with data-form-modal
+ $('body').on('click', 'a[data-form-modal]', function (ev) {
+ ev.preventDefault();
+ var href = $(this).attr('href')
+ , confirmHeader = $(this).data('header') ? $(this).data('header') : 'Submit Form'
+ , size = $(this).data('modal-large') ? true : false;
+
+ self.triggerModalOpen(href,confirmHeader,size);
+
+ return false;
+ });
+
+ var $contentContainter = $('body');
+
+ $contentContainter.on('submit', 'form.ajaxify', function (e) {
+ e.preventDefault();
+ var loadingText = 'Submitting Form...';
+ if ($(this).data('masklabel')) {
+ loadingText = $(this).data('masklabel');
+ }
+
+ $contentContainter.mask({label: loadingText});
+
+ var $form = $(this);
+ $.ajax({
+ type: $form.attr('method'),
+ url: $form.attr('action'),
+ data: new FormData(this),
+ dataType: "json",
+ processData: false, // Don't process the files
+ contentType: false, // Set content type to false as jQuery will tell the server its a query string request
+ cache: false,
+ success: function (data) {
+ console.log(data);
+ if(data.redirect){
+ location = data.redirect;
+ }else if(data.modalContent){
+ $('#dataFormModal .form-content').html(data.modalContent);
+ }else{
+ location.reload();
+ }
+
+ //$contentContainter.unmask();
+ //$(".modal.in").modal('hide');
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ if (typeof jqXHR.responseJSON !== 'undefined') {
+ if (jqXHR.responseJSON.hasOwnProperty('form')) {
+ $('#dataFormModal .form-content').html(jqXHR.responseJSON.form);
+ }
+ //$('.form_error').html(jqXHR.responseJSON.message);
+ } else {
+ alert(errorThrown);
+ }
+ $contentContainter.unmask();
+
+ }
+ });
+ });
+
+ }
+
+ ,triggerModalOpen : function(href,header,large){
+ $(".modal.in").modal('hide');
+
+ var sizeClass = large?'modal-lg':'';
+
+ $('#dataFormModal').remove();
+ if (!$('#dataFormModal').length) {
+ $('body').append('');
+ }
+ $('#dataFormModal').find('.form-content').load(href,function(){
+
+ });
+
+ $('#dataFormModal').modal({show: true});
+ }
+
+ };
+
+}();
+
+
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/pick-a-color-1.2.3.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/pick-a-color-1.2.3.min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/pick-a-color-1.2.3.min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/pick-a-color-1.2.3.min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-bootstrap.css b/app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-bootstrap.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-bootstrap.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-bootstrap.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-spinner.gif b/app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-spinner.gif
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-spinner.gif
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2-spinner.gif
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.css b/app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.png b/app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2x2.png b/app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2x2.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2x2.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/select2/v3.5/select2x2.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/js/tinycolor-min.js b/app/src/VersionControl/GitControlBundle/Resources/public/js/tinycolor-min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/js/tinycolor-min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/js/tinycolor-min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/AdminLTE.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/custom.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/custom.css
similarity index 91%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/custom.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/custom.css
index 2e975ff..affd4c9 100644
--- a/src/VersionControl/GitControlBundle/Resources/public/theme/css/custom.css
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/custom.css
@@ -488,3 +488,67 @@ a.environment-info-btn.active>.fa-angle-left {
transform: rotate(-90deg);
}
+.error-box{
+ width: 700px;
+ margin: 3% auto;
+ background: #fff;
+ padding: 20px;
+ box-shadow: 5px 5px 10px #888888;
+}
+
+.error-box-body {
+ background: #fff;
+ border-top: 0;
+ color: #666;
+}
+
+.error-box-body .headline{
+ margin: 0;
+ padding: 0;
+ float: left;
+ font-size: 100px;
+ font-weight: 300;
+ line-height: 70px;
+}
+.error-box-body>.error-content {
+ margin-left: 190px;
+ display: block;
+}
+
+.error-box-body>.error-content>h3 {
+ font-weight: 300;
+ font-size: 25px;
+ margin-top: 0;
+}
+
+.small-box h3{
+ color: #fff;
+ font-size: 28px;
+ font-weight: normal;
+}
+
+.small-box a p{
+ color: #fff;
+}
+
+.small-box .icon{
+ font-size: 80px;
+}
+
+ul.list-info{
+ font-size: 14px;
+ color: #b8c7ce;
+ display: inline-block;
+ padding: 6px 12px;
+ line-height: 1.42857143;
+ margin: 0;
+}
+
+.tag-subject{
+ display: inline-block;
+ padding: 6px 12px;
+ font-size: 14px;
+ font-weight: 400;
+ line-height: 1.42857143;
+}
+
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/pick-a-color-1.2.3.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/pick-a-color-1.2.3.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/pick-a-color-1.2.3.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/pick-a-color-1.2.3.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/_all-skins.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black-light.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-black.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue-light.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-blue.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green-light.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-green.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple-light.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-purple.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red-light.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-red.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow-light.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/css/skins/skin-yellow.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar04.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar04.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar04.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar04.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar2.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar2.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar2.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar2.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar3.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar3.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar3.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar3.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar5.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar5.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar5.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/avatar5.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/boxed-bg.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/american-express.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/american-express.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/american-express.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/american-express.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/cirrus.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/cirrus.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/cirrus.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/cirrus.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mastercard.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mastercard.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mastercard.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mastercard.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mestro.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mestro.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mestro.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/mestro.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal2.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal2.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal2.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/paypal2.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/visa.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/visa.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/visa.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/credit/visa.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/default-50x50.gif b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/default-50x50.gif
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/default-50x50.gif
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/default-50x50.gif
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/icons.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/icons.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/icons.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/icons.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo1.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo1.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/photo1.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo1.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo2.png b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo2.png
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/photo2.png
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo2.png
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo3.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo3.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/photo3.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo3.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo4.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo4.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/photo4.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/photo4.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user1-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user1-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user1-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user1-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user2-160x160.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user2-160x160.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user2-160x160.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user2-160x160.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user3-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user3-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user3-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user3-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user4-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user4-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user4-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user4-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user5-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user5-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user5-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user5-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user6-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user6-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user6-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user6-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user7-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user7-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user7-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user7-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/img/user8-128x128.jpg b/app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user8-128x128.jpg
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/img/user8-128x128.jpg
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/img/user8-128x128.jpg
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/js/app.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/js/app.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/js/app.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/js/app.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/js/app.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/js/app.min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/js/app.min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/js/app.min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/js/demo.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/js/demo.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/js/demo.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/js/demo.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard2.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard2.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard2.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/js/pages/dashboard2.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/bootstrap-slider.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/bootstrap-slider.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/bootstrap-slider.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/bootstrap-slider.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/slider.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/slider.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/slider.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-slider/slider.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.min.js b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.min.js
similarity index 100%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.min.js
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/chartjs/Chart.min.js
diff --git a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/ckeditor/CHANGES.md b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/ckeditor/CHANGES.md
similarity index 99%
rename from src/VersionControl/GitControlBundle/Resources/public/theme/plugins/ckeditor/CHANGES.md
rename to app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/ckeditor/CHANGES.md
index 1316da9..249f0d4 100644
--- a/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/ckeditor/CHANGES.md
+++ b/app/src/VersionControl/GitControlBundle/Resources/public/theme/plugins/ckeditor/CHANGES.md
@@ -1,378 +1,378 @@
-CKEditor 4 Changelog
-====================
-
-## CKEditor 4.3.1
-
-**Important Notes:**
-
-* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
-* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
-
-Fixed Issues:
-
-* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
-* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
-* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
-* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
-* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
-* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
-* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
-* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
-* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
-* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
-* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
-* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
-* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
-* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
-* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
-* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
-* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
-* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
-* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
-* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
-* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
-* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
-* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
-* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `
+ {% endmacro %}
+
+Each macro argument can have a default value (here ``text`` is the default value
+for ``type`` if not provided in the call).
+
+Macros differ from native PHP functions in a few ways:
+
+* Arguments of a macro are always optional.
+
+* If extra positional arguments are passed to a macro, they end up in the
+ special ``varargs`` variable as a list of values.
+
+But as with PHP functions, macros don't have access to the current template
+variables.
+
+.. tip::
+
+ You can pass the whole context as an argument by using the special
+ ``_context`` variable.
+
+Importing Macros
+----------------
+
+There are two ways to import macros. You can import the complete template
+containing the macros into a local variable (via the ``import`` tag) or only
+import specific macros from the template (via the ``from`` tag).
+
+To import all macros from a template into a local variable, use the ``import``
+tag:
+
+.. code-block:: twig
+
+ {% import "forms.html" as forms %}
+
+The above ``import`` call imports the ``forms.html`` file (which can contain
+only macros, or a template and some macros), and import the macros as items of
+the ``forms`` local variable.
+
+The macros can then be called at will in the *current* template:
+
+.. code-block:: twig
+
+ {{ forms.input('username') }}
+ {{ forms.input('password', null, 'password') }}
+
+Alternatively you can import names from the template into the current namespace
+via the ``from`` tag:
+
+.. code-block:: twig
+
+ {% from 'forms.html' import input as input_field, textarea %}
+
+ {{ input_field('password', '', 'password') }}
+ {{ textarea('comment') }}
+
+.. tip::
+
+ When macro usages and definitions are in the same template, you don't need to
+ import the macros as they are automatically available under the special
+ ``_self`` variable:
+
+ .. code-block:: twig
+
+ {{ _self.input('password', '', 'password') }}
+
+ {% macro input(name, value, type = "text", size = 20) %}
+ {{ forms.input('username') }}
+
+.. note::
+
+ Before Twig 2.11, when you want to use a macro in another macro from the
+ same file, you need to import it locally:
+
+ .. code-block:: twig
+
+ {% macro input(name, value, type, size) %}
+
+ {{ forms.input(name, value, type, size) }}
+
+ {% endmacro %}
+
+Macros Scoping
+--------------
+
+.. versionadded:: 2.11
+
+ The scoping rules described in this paragraph are implemented as of Twig
+ 2.11.
+
+The scoping rules are the same whether you imported macros via ``import`` or
+``from``.
+
+Imported macros are always **local** to the current template. It means that
+macros are available in all blocks and other macros defined in the current
+template, but they are not available in included templates or child templates;
+you need to explicitely re-import macros in each template.
+
+When calling ``import`` or ``from`` from a ``block`` tag, the imported macros
+are only defined in the current block and they override macros defined at the
+template level with the same names.
+
+When calling ``import`` or ``from`` from a ``macro`` tag, the imported macros
+are only defined in the current macro and they override macros defined at the
+template level with the same names.
+
+.. note::
+
+ Before Twig 2.11, it was possible to use macros imported in a block in a
+ "sub-block". When upgrading to 2.11, you need to either move the import in
+ the global scope or reimport the macros explicitly in the "sub-blocks".
+
+Checking if a Macro is defined
+------------------------------
+
+.. versionadded:: 2.11
+
+ Support for the ``defined`` test on macros was added in Twig 2.11.
+
+You can check if a macro is defined via the ``defined`` test:
+
+.. code-block:: twig
+
+ {% import "macros.twig" as macros %}
+
+ {% from "macros.twig" import hello %}
+
+ {% if macros.hello is defined -%}
+ OK
+ {% endif %}
+
+ {% if hello is defined -%}
+ OK
+ {% endif %}
+
+Named Macro End-Tags
+--------------------
+
+Twig allows you to put the name of the macro after the end tag for better
+readability:
+
+.. code-block:: twig
+
+ {% macro input() %}
+ ...
+ {% endmacro input %}
+
+Of course, the name after the ``endmacro`` word must match the macro name.
diff --git a/app/vendor/twig/twig/doc/tags/sandbox.rst b/app/vendor/twig/twig/doc/tags/sandbox.rst
new file mode 100644
index 0000000..b331fdb
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tags/sandbox.rst
@@ -0,0 +1,30 @@
+``sandbox``
+===========
+
+The ``sandbox`` tag can be used to enable the sandboxing mode for an included
+template, when sandboxing is not enabled globally for the Twig environment:
+
+.. code-block:: twig
+
+ {% sandbox %}
+ {% include 'user.html' %}
+ {% endsandbox %}
+
+.. warning::
+
+ The ``sandbox`` tag is only available when the sandbox extension is
+ enabled (see the :doc:`Twig for Developers<../api>` chapter).
+
+.. note::
+
+ The ``sandbox`` tag can only be used to sandbox an include tag and it
+ cannot be used to sandbox a section of a template. The following example
+ won't work:
+
+ .. code-block:: twig
+
+ {% sandbox %}
+ {% for i in 1..2 %}
+ {{ i }}
+ {% endfor %}
+ {% endsandbox %}
diff --git a/app/vendor/twig/twig/doc/tags/set.rst b/app/vendor/twig/twig/doc/tags/set.rst
new file mode 100644
index 0000000..f752fdd
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tags/set.rst
@@ -0,0 +1,78 @@
+``set``
+=======
+
+Inside code blocks you can also assign values to variables. Assignments use
+the ``set`` tag and can have multiple targets.
+
+Here is how you can assign the ``bar`` value to the ``foo`` variable:
+
+.. code-block:: twig
+
+ {% set foo = 'bar' %}
+
+After the ``set`` call, the ``foo`` variable is available in the template like
+any other ones:
+
+.. code-block:: twig
+
+ {# displays bar #}
+ {{ foo }}
+
+The assigned value can be any valid :ref:`Twig expression
+`:
+
+.. code-block:: twig
+
+ {% set foo = [1, 2] %}
+ {% set foo = {'foo': 'bar'} %}
+ {% set foo = 'foo' ~ 'bar' %}
+
+Several variables can be assigned in one block:
+
+.. code-block:: twig
+
+ {% set foo, bar = 'foo', 'bar' %}
+
+ {# is equivalent to #}
+
+ {% set foo = 'foo' %}
+ {% set bar = 'bar' %}
+
+The ``set`` tag can also be used to 'capture' chunks of text:
+
+.. code-block:: twig
+
+ {% set foo %}
+
+ {% endset %}
+
+.. caution::
+
+ If you enable automatic output escaping, Twig will only consider the
+ content to be safe when capturing chunks of text.
+
+.. note::
+
+ Note that loops are scoped in Twig; therefore a variable declared inside a
+ ``for`` loop is not accessible outside the loop itself:
+
+ .. code-block:: twig
+
+ {% for item in list %}
+ {% set foo = item %}
+ {% endfor %}
+
+ {# foo is NOT available #}
+
+ If you want to access the variable, just declare it before the loop:
+
+ .. code-block:: twig
+
+ {% set foo = "" %}
+ {% for item in list %}
+ {% set foo = item %}
+ {% endfor %}
+
+ {# foo is available #}
diff --git a/app/vendor/twig/twig/doc/tags/spaceless.rst b/app/vendor/twig/twig/doc/tags/spaceless.rst
new file mode 100644
index 0000000..2608538
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tags/spaceless.rst
@@ -0,0 +1,41 @@
+``spaceless``
+=============
+
+.. tip::
+
+ As of Twig 1.38, use the :doc:`spaceless <../filters/spaceless>` filter instead.
+
+Use the ``spaceless`` tag to remove whitespace *between HTML tags*, not
+whitespace within HTML tags or whitespace in plain text:
+
+.. code-block:: twig
+
+ {% spaceless %}
+
+ foo
+
+ {% endspaceless %}
+
+ {# output will be foo
#}
+
+This tag is not meant to "optimize" the size of the generated HTML content but
+merely to avoid extra whitespace between HTML tags to avoid browser rendering
+quirks under some circumstances.
+
+.. tip::
+
+ If you want to optimize the size of the generated HTML content, gzip
+ compress the output instead.
+
+.. tip::
+
+ If you want to create a tag that actually removes all extra whitespace in
+ an HTML string, be warned that this is not as easy as it seems to be
+ (think of ``textarea`` or ``pre`` tags for instance). Using a third-party
+ library like Tidy is probably a better idea.
+
+.. tip::
+
+ For more information on whitespace control, read the
+ :ref:`dedicated section ` of the documentation and learn how
+ you can also use the whitespace control modifier on your tags.
diff --git a/app/vendor/twig/twig/doc/tags/use.rst b/app/vendor/twig/twig/doc/tags/use.rst
new file mode 100644
index 0000000..2aca6a0
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tags/use.rst
@@ -0,0 +1,117 @@
+``use``
+=======
+
+.. note::
+
+ Horizontal reuse is an advanced Twig feature that is hardly ever needed in
+ regular templates. It is mainly used by projects that need to make
+ template blocks reusable without using inheritance.
+
+Template inheritance is one of the most powerful features of Twig but it is
+limited to single inheritance; a template can only extend one other template.
+This limitation makes template inheritance simple to understand and easy to
+debug:
+
+.. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% block title %}{% endblock %}
+ {% block content %}{% endblock %}
+
+Horizontal reuse is a way to achieve the same goal as multiple inheritance,
+but without the associated complexity:
+
+.. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% use "blocks.html" %}
+
+ {% block title %}{% endblock %}
+ {% block content %}{% endblock %}
+
+The ``use`` statement tells Twig to import the blocks defined in
+``blocks.html`` into the current template (it's like macros, but for blocks):
+
+.. code-block:: twig
+
+ {# blocks.html #}
+
+ {% block sidebar %}{% endblock %}
+
+In this example, the ``use`` statement imports the ``sidebar`` block into the
+main template. The code is mostly equivalent to the following one (the
+imported blocks are not outputted automatically):
+
+.. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% block sidebar %}{% endblock %}
+ {% block title %}{% endblock %}
+ {% block content %}{% endblock %}
+
+.. note::
+
+ The ``use`` tag only imports a template if it does not extend another
+ template, if it does not define macros, and if the body is empty. But it
+ can *use* other templates.
+
+.. note::
+
+ Because ``use`` statements are resolved independently of the context
+ passed to the template, the template reference cannot be an expression.
+
+The main template can also override any imported block. If the template
+already defines the ``sidebar`` block, then the one defined in ``blocks.html``
+is ignored. To avoid name conflicts, you can rename imported blocks:
+
+.. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% use "blocks.html" with sidebar as base_sidebar, title as base_title %}
+
+ {% block sidebar %}{% endblock %}
+ {% block title %}{% endblock %}
+ {% block content %}{% endblock %}
+
+The ``parent()`` function automatically determines the correct inheritance
+tree, so it can be used when overriding a block defined in an imported
+template:
+
+.. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% use "blocks.html" %}
+
+ {% block sidebar %}
+ {{ parent() }}
+ {% endblock %}
+
+ {% block title %}{% endblock %}
+ {% block content %}{% endblock %}
+
+In this example, ``parent()`` will correctly call the ``sidebar`` block from
+the ``blocks.html`` template.
+
+.. tip::
+
+ Renaming allows you to simulate inheritance by calling the "parent" block:
+
+ .. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% use "blocks.html" with sidebar as parent_sidebar %}
+
+ {% block sidebar %}
+ {{ block('parent_sidebar') }}
+ {% endblock %}
+
+.. note::
+
+ You can use as many ``use`` statements as you want in any given template.
+ If two imported templates define the same block, the latest one wins.
diff --git a/app/vendor/twig/twig/doc/tags/verbatim.rst b/app/vendor/twig/twig/doc/tags/verbatim.rst
new file mode 100644
index 0000000..88c6152
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tags/verbatim.rst
@@ -0,0 +1,16 @@
+``verbatim``
+============
+
+The ``verbatim`` tag marks sections as being raw text that should not be
+parsed. For example to put Twig syntax as example into a template you can use
+this snippet:
+
+.. code-block:: twig
+
+ {% verbatim %}
+
+ {% for item in seq %}
+ {{ item }}
+ {% endfor %}
+
+ {% endverbatim %}
diff --git a/app/vendor/twig/twig/doc/tags/with.rst b/app/vendor/twig/twig/doc/tags/with.rst
new file mode 100644
index 0000000..107432f
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tags/with.rst
@@ -0,0 +1,41 @@
+``with``
+========
+
+Use the ``with`` tag to create a new inner scope. Variables set within this
+scope are not visible outside of the scope:
+
+.. code-block:: twig
+
+ {% with %}
+ {% set foo = 42 %}
+ {{ foo }} {# foo is 42 here #}
+ {% endwith %}
+ foo is not visible here any longer
+
+Instead of defining variables at the beginning of the scope, you can pass a
+hash of variables you want to define in the ``with`` tag; the previous example
+is equivalent to the following one:
+
+.. code-block:: twig
+
+ {% with { foo: 42 } %}
+ {{ foo }} {# foo is 42 here #}
+ {% endwith %}
+ foo is not visible here any longer
+
+ {# it works with any expression that resolves to a hash #}
+ {% set vars = { foo: 42 } %}
+ {% with vars %}
+ ...
+ {% endwith %}
+
+By default, the inner scope has access to the outer scope context; you can
+disable this behavior by appending the ``only`` keyword:
+
+.. code-block:: twig
+
+ {% set bar = 'bar' %}
+ {% with { foo: 42 } only %}
+ {# only foo is defined #}
+ {# bar is not defined #}
+ {% endwith %}
diff --git a/app/vendor/twig/twig/doc/templates.rst b/app/vendor/twig/twig/doc/templates.rst
new file mode 100644
index 0000000..3aa3ea9
--- /dev/null
+++ b/app/vendor/twig/twig/doc/templates.rst
@@ -0,0 +1,869 @@
+Twig for Template Designers
+===========================
+
+This document describes the syntax and semantics of the template engine and
+will be most useful as reference to those creating Twig templates.
+
+Synopsis
+--------
+
+A template is a regular text file. It can generate any text-based format (HTML,
+XML, CSV, LaTeX, etc.). It doesn't have a specific extension, ``.html`` or
+``.xml`` are just fine.
+
+A template contains **variables** or **expressions**, which get replaced with
+values when the template is evaluated, and **tags**, which control the
+template's logic.
+
+Below is a minimal template that illustrates a few basics. We will cover further
+details later on:
+
+.. code-block:: html+twig
+
+
+
+
+ My Webpage
+
+
+
+
+ My Webpage
+ {{ a_variable }}
+
+
+
+There are two kinds of delimiters: ``{% ... %}`` and ``{{ ... }}``. The first
+one is used to execute statements such as for-loops, the latter outputs the
+result of an expression.
+
+IDEs Integration
+----------------
+
+Many IDEs support syntax highlighting and auto-completion for Twig:
+
+* *Textmate* via the `Twig bundle`_
+* *Vim* via the `Jinja syntax plugin`_ or the `vim-twig plugin`_
+* *Netbeans* via the `Twig syntax plugin`_ (until 7.1, native as of 7.2)
+* *PhpStorm* (native as of 2.1)
+* *Eclipse* via the `Twig plugin`_
+* *Sublime Text* via the `Twig bundle`_
+* *GtkSourceView* via the `Twig language definition`_ (used by gedit and other projects)
+* *Coda* and *SubEthaEdit* via the `Twig syntax mode`_
+* *Coda 2* via the `other Twig syntax mode`_
+* *Komodo* and *Komodo Edit* via the Twig highlight/syntax check mode
+* *Notepad++* via the `Notepad++ Twig Highlighter`_
+* *Emacs* via `web-mode.el`_
+* *Atom* via the `PHP-twig for atom`_
+* *Visual Studio Code* via the `Twig pack`_
+
+Also, `TwigFiddle`_ is an online service that allows you to execute Twig templates
+from a browser; it supports all versions of Twig.
+
+Variables
+---------
+
+The application passes variables to the templates for manipulation in the
+template. Variables may have attributes or elements you can access, too. The
+visual representation of a variable depends heavily on the application providing
+it.
+
+Use a dot (``.``) to access attributes of a variable (methods or properties of a
+PHP object, or items of a PHP array):
+
+.. code-block:: twig
+
+ {{ foo.bar }}
+
+.. note::
+
+ It's important to know that the curly braces are *not* part of the
+ variable but the print statement. When accessing variables inside tags,
+ don't put the braces around them.
+
+.. sidebar:: Implementation
+
+ For convenience's sake ``foo.bar`` does the following things on the PHP
+ layer:
+
+ * check if ``foo`` is an array and ``bar`` a valid element;
+ * if not, and if ``foo`` is an object, check that ``bar`` is a valid property;
+ * if not, and if ``foo`` is an object, check that ``bar`` is a valid method
+ (even if ``bar`` is the constructor - use ``__construct()`` instead);
+ * if not, and if ``foo`` is an object, check that ``getBar`` is a valid method;
+ * if not, and if ``foo`` is an object, check that ``isBar`` is a valid method;
+ * if not, and if ``foo`` is an object, check that ``hasBar`` is a valid method;
+ * if not, return a ``null`` value.
+
+ Twig also supports a specific syntax for accessing items on PHP arrays,
+ ``foo['bar']``:
+
+ * check if ``foo`` is an array and ``bar`` a valid element;
+ * if not, return a ``null`` value.
+
+If a variable or attribute does not exist, you will receive a ``null`` value
+when the ``strict_variables`` option is set to ``false``; alternatively, if ``strict_variables``
+is set, Twig will throw an error (see :ref:`environment options`).
+
+.. note::
+
+ If you want to access a dynamic attribute of a variable, use the
+ :doc:`attribute` function instead.
+
+ The ``attribute`` function is also useful when the attribute contains
+ special characters (like ``-`` that would be interpreted as the minus
+ operator):
+
+ .. code-block:: twig
+
+ {# equivalent to the non-working foo.data-foo #}
+ {{ attribute(foo, 'data-foo') }}
+
+Global Variables
+~~~~~~~~~~~~~~~~
+
+The following variables are always available in templates:
+
+* ``_self``: references the current template name;
+* ``_context``: references the current context;
+* ``_charset``: references the current charset.
+
+Setting Variables
+~~~~~~~~~~~~~~~~~
+
+You can assign values to variables inside code blocks. Assignments use the
+:doc:`set` tag:
+
+.. code-block:: twig
+
+ {% set foo = 'foo' %}
+ {% set foo = [1, 2] %}
+ {% set foo = {'foo': 'bar'} %}
+
+Filters
+-------
+
+Variables can be modified by **filters**. Filters are separated from the
+variable by a pipe symbol (``|``). Multiple filters can be chained. The output
+of one filter is applied to the next.
+
+The following example removes all HTML tags from the ``name`` and title-cases
+it:
+
+.. code-block:: twig
+
+ {{ name|striptags|title }}
+
+Filters that accept arguments have parentheses around the arguments. This
+example joins the elements of a list by commas:
+
+.. code-block:: twig
+
+ {{ list|join(', ') }}
+
+To apply a filter on a section of code, wrap it with the
+:doc:`apply` tag:
+
+.. code-block:: twig
+
+ {% apply upper %}
+ This text becomes uppercase
+ {% endapply %}
+
+Go to the :doc:`filters` page to learn more about built-in
+filters.
+
+.. note::
+
+ The ``apply`` tag was introduced in Twig 2.9; use the ``filter`` tag with
+ previous versions.
+
+Functions
+---------
+
+Functions can be called to generate content. Functions are called by their
+name followed by parentheses (``()``) and may have arguments.
+
+For instance, the ``range`` function returns a list containing an arithmetic
+progression of integers:
+
+.. code-block:: twig
+
+ {% for i in range(0, 3) %}
+ {{ i }},
+ {% endfor %}
+
+Go to the :doc:`functions` page to learn more about the
+built-in functions.
+
+.. _named-arguments:
+
+Named Arguments
+---------------
+
+.. code-block:: twig
+
+ {% for i in range(low=1, high=10, step=2) %}
+ {{ i }},
+ {% endfor %}
+
+Using named arguments makes your templates more explicit about the meaning of
+the values you pass as arguments:
+
+.. code-block:: twig
+
+ {{ data|convert_encoding('UTF-8', 'iso-2022-jp') }}
+
+ {# versus #}
+
+ {{ data|convert_encoding(from='iso-2022-jp', to='UTF-8') }}
+
+Named arguments also allow you to skip some arguments for which you don't want
+to change the default value:
+
+.. code-block:: twig
+
+ {# the first argument is the date format, which defaults to the global date format if null is passed #}
+ {{ "now"|date(null, "Europe/Paris") }}
+
+ {# or skip the format value by using a named argument for the time zone #}
+ {{ "now"|date(timezone="Europe/Paris") }}
+
+You can also use both positional and named arguments in one call, in which
+case positional arguments must always come before named arguments:
+
+.. code-block:: twig
+
+ {{ "now"|date('d/m/Y H:i', timezone="Europe/Paris") }}
+
+.. tip::
+
+ Each function and filter documentation page has a section where the names
+ of all arguments are listed when supported.
+
+Control Structure
+-----------------
+
+A control structure refers to all those things that control the flow of a
+program - conditionals (i.e. ``if``/``elseif``/``else``), ``for``-loops, as
+well as things like blocks. Control structures appear inside ``{% ... %}``
+blocks.
+
+For example, to display a list of users provided in a variable called
+``users``, use the :doc:`for` tag:
+
+.. code-block:: twig
+
+ Members
+
+ {% for user in users %}
+ {{ user.username|e }}
+ {% endfor %}
+
+
+The :doc:`if` tag can be used to test an expression:
+
+.. code-block:: twig
+
+ {% if users|length > 0 %}
+
+ {% for user in users %}
+ {{ user.username|e }}
+ {% endfor %}
+
+ {% endif %}
+
+Go to the :doc:`tags` page to learn more about the built-in tags.
+
+Comments
+--------
+
+To comment-out part of a line in a template, use the comment syntax ``{# ...
+#}``. This is useful for debugging or to add information for other template
+designers or yourself:
+
+.. code-block:: twig
+
+ {# note: disabled template because we no longer use this
+ {% for user in users %}
+ ...
+ {% endfor %}
+ #}
+
+Including other Templates
+-------------------------
+
+The :doc:`include` function is useful to include a template
+and return the rendered content of that template into the current one:
+
+.. code-block:: twig
+
+ {{ include('sidebar.html') }}
+
+By default, included templates have access to the same context as the template
+which includes them. This means that any variable defined in the main template
+will be available in the included template too:
+
+.. code-block:: twig
+
+ {% for box in boxes %}
+ {{ include('render_box.html') }}
+ {% endfor %}
+
+The included template ``render_box.html`` is able to access the ``box`` variable.
+
+The name of the template depends on the template loader. For instance, the
+``\Twig\Loader\FilesystemLoader`` allows you to access other templates by giving the
+filename. You can access templates in subdirectories with a slash:
+
+.. code-block:: twig
+
+ {{ include('sections/articles/sidebar.html') }}
+
+This behavior depends on the application embedding Twig.
+
+Template Inheritance
+--------------------
+
+The most powerful part of Twig is template inheritance. Template inheritance
+allows you to build a base "skeleton" template that contains all the common
+elements of your site and defines **blocks** that child templates can
+override.
+
+It's easier to understand the concept by starting with an example.
+
+Let's define a base template, ``base.html``, which defines an HTML skeleton
+document that might be used for a two-column page:
+
+.. code-block:: html+twig
+
+
+
+
+ {% block head %}
+ {% block title %}{% endblock %} - My Webpage
+ {% endblock %}
+
+
+ {% block content %}{% endblock %}
+
+
+
+
+In this example, the :doc:`block` tags define four blocks that
+child templates can fill in. All the ``block`` tag does is to tell the
+template engine that a child template may override those portions of the
+template.
+
+A child template might look like this:
+
+.. code-block:: twig
+
+ {% extends "base.html" %}
+
+ {% block title %}Index{% endblock %}
+ {% block head %}
+ {{ parent() }}
+
+ {% endblock %}
+ {% block content %}
+ Index
+
+ Welcome to my awesome homepage.
+
+ {% endblock %}
+
+The :doc:`extends` tag is the key here. It tells the template
+engine that this template "extends" another template. When the template system
+evaluates this template, first it locates the parent. The extends tag should
+be the first tag in the template.
+
+Note that since the child template doesn't define the ``footer`` block, the
+value from the parent template is used instead.
+
+It's possible to render the contents of the parent block by using the
+:doc:`parent` function. This gives back the results of the
+parent block:
+
+.. code-block:: twig
+
+ {% block sidebar %}
+ Table Of Contents
+ ...
+ {{ parent() }}
+ {% endblock %}
+
+.. tip::
+
+ The documentation page for the :doc:`extends` tag describes
+ more advanced features like block nesting, scope, dynamic inheritance, and
+ conditional inheritance.
+
+.. note::
+
+ Twig also supports multiple inheritance via "horizontal reuse" with the help
+ of the :doc:`use` tag.
+
+HTML Escaping
+-------------
+
+When generating HTML from templates, there's always a risk that a variable
+will include characters that affect the resulting HTML. There are two
+approaches: manually escaping each variable or automatically escaping
+everything by default.
+
+Twig supports both, automatic escaping is enabled by default.
+
+The automatic escaping strategy can be configured via the
+:ref:`autoescape` option and defaults to ``html``.
+
+Working with Manual Escaping
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If manual escaping is enabled, it is **your** responsibility to escape variables
+if needed. What to escape? Any variable that comes from an untrusted source.
+
+Escaping works by using the :doc:`escape` or ``e`` filter:
+
+.. code-block:: twig
+
+ {{ user.username|e }}
+
+By default, the ``escape`` filter uses the ``html`` strategy, but depending on
+the escaping context, you might want to explicitly use an other strategy:
+
+.. code-block:: twig
+
+ {{ user.username|e('js') }}
+ {{ user.username|e('css') }}
+ {{ user.username|e('url') }}
+ {{ user.username|e('html_attr') }}
+
+Working with Automatic Escaping
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Whether automatic escaping is enabled or not, you can mark a section of a
+template to be escaped or not by using the :doc:`autoescape`
+tag:
+
+.. code-block:: twig
+
+ {% autoescape %}
+ Everything will be automatically escaped in this block (using the HTML strategy)
+ {% endautoescape %}
+
+By default, auto-escaping uses the ``html`` escaping strategy. If you output
+variables in other contexts, you need to explicitly escape them with the
+appropriate escaping strategy:
+
+.. code-block:: twig
+
+ {% autoescape 'js' %}
+ Everything will be automatically escaped in this block (using the JS strategy)
+ {% endautoescape %}
+
+Escaping
+--------
+
+It is sometimes desirable or even necessary to have Twig ignore parts it would
+otherwise handle as variables or blocks. For example if the default syntax is
+used and you want to use ``{{`` as raw string in the template and not start a
+variable you have to use a trick.
+
+The easiest way is to output the variable delimiter (``{{``) by using a variable
+expression:
+
+.. code-block:: twig
+
+ {{ '{{' }}
+
+For bigger sections it makes sense to mark a block
+:doc:`verbatim`.
+
+Macros
+------
+
+Macros are comparable with functions in regular programming languages. They are
+useful to reuse HTML fragments to not repeat yourself. They are described in the
+:doc:`macro` tag documentation.
+
+.. _twig-expressions:
+
+Expressions
+-----------
+
+Twig allows expressions everywhere.
+
+.. note::
+
+ The operator precedence is as follows, with the lowest-precedence operators
+ listed first: ``?:`` (ternary operator), ``b-and``, ``b-xor``, ``b-or``,
+ ``or``, ``and``, ``==``, ``!=``, ``<``, ``>``, ``>=``, ``<=``, ``in``,
+ ``matches``, ``starts with``, ``ends with``, ``..``, ``+``, ``-``, ``~``,
+ ``*``, ``/``, ``//``, ``%``, ``is`` (tests), ``**``, ``??``, ``|``
+ (filters), ``[]``, and ``.``.
+
+ .. code-block:: twig
+
+ {% set greeting = 'Hello ' %}
+ {% set name = 'Fabien' %}
+
+ {{ greeting ~ name|lower }} {# Hello fabien #}
+
+ {# use parenthesis to change precedence #}
+ {{ (greeting ~ name)|lower }} {# hello fabien #}
+
+Literals
+~~~~~~~~
+
+The simplest form of expressions are literals. Literals are representations
+for PHP types such as strings, numbers, and arrays. The following literals
+exist:
+
+* ``"Hello World"``: Everything between two double or single quotes is a
+ string. They are useful whenever you need a string in the template (for
+ example as arguments to function calls, filters or just to extend or include
+ a template). A string can contain a delimiter if it is preceded by a
+ backslash (``\``) -- like in ``'It\'s good'``. If the string contains a
+ backslash (e.g. ``'c:\Program Files'``) escape it by doubling it
+ (e.g. ``'c:\\Program Files'``).
+
+* ``42`` / ``42.23``: Integers and floating point numbers are created by
+ writing the number down. If a dot is present the number is a float,
+ otherwise an integer.
+
+* ``["foo", "bar"]``: Arrays are defined by a sequence of expressions
+ separated by a comma (``,``) and wrapped with squared brackets (``[]``).
+
+* ``{"foo": "bar"}``: Hashes are defined by a list of keys and values
+ separated by a comma (``,``) and wrapped with curly braces (``{}``):
+
+ .. code-block:: twig
+
+ {# keys as string #}
+ { 'foo': 'foo', 'bar': 'bar' }
+
+ {# keys as names (equivalent to the previous hash) #}
+ { foo: 'foo', bar: 'bar' }
+
+ {# keys as integer #}
+ { 2: 'foo', 4: 'bar' }
+
+ {# keys as expressions (the expression must be enclosed into parentheses) #}
+ {% set foo = 'foo' %}
+ { (foo): 'foo', (1 + 1): 'bar', (foo ~ 'b'): 'baz' }
+
+* ``true`` / ``false``: ``true`` represents the true value, ``false``
+ represents the false value.
+
+* ``null``: ``null`` represents no specific value. This is the value returned
+ when a variable does not exist. ``none`` is an alias for ``null``.
+
+Arrays and hashes can be nested:
+
+.. code-block:: twig
+
+ {% set foo = [1, {"foo": "bar"}] %}
+
+.. tip::
+
+ Using double-quoted or single-quoted strings has no impact on performance
+ but :ref:`string interpolation ` is only
+ supported in double-quoted strings.
+
+Math
+~~~~
+
+Twig allows you to do math in templates; the following operators are supported:
+
+* ``+``: Adds two numbers together (the operands are casted to numbers). ``{{
+ 1 + 1 }}`` is ``2``.
+
+* ``-``: Subtracts the second number from the first one. ``{{ 3 - 2 }}`` is
+ ``1``.
+
+* ``/``: Divides two numbers. The returned value will be a floating point
+ number. ``{{ 1 / 2 }}`` is ``{{ 0.5 }}``.
+
+* ``%``: Calculates the remainder of an integer division. ``{{ 11 % 7 }}`` is
+ ``4``.
+
+* ``//``: Divides two numbers and returns the floored integer result. ``{{ 20
+ // 7 }}`` is ``2``, ``{{ -20 // 7 }}`` is ``-3`` (this is just syntactic
+ sugar for the :doc:`round` filter).
+
+* ``*``: Multiplies the left operand with the right one. ``{{ 2 * 2 }}`` would
+ return ``4``.
+
+* ``**``: Raises the left operand to the power of the right operand. ``{{ 2 **
+ 3 }}`` would return ``8``.
+
+.. _template_logic:
+
+Logic
+~~~~~
+
+You can combine multiple expressions with the following operators:
+
+* ``and``: Returns true if the left and the right operands are both true.
+
+* ``or``: Returns true if the left or the right operand is true.
+
+* ``not``: Negates a statement.
+
+* ``(expr)``: Groups an expression.
+
+.. note::
+
+ Twig also supports bitwise operators (``b-and``, ``b-xor``, and ``b-or``).
+
+.. note::
+
+ Operators are case sensitive.
+
+Comparisons
+~~~~~~~~~~~
+
+The following comparison operators are supported in any expression: ``==``,
+``!=``, ``<``, ``>``, ``>=``, and ``<=``.
+
+You can also check if a string ``starts with`` or ``ends with`` another
+string:
+
+.. code-block:: twig
+
+ {% if 'Fabien' starts with 'F' %}
+ {% endif %}
+
+ {% if 'Fabien' ends with 'n' %}
+ {% endif %}
+
+.. note::
+
+ For complex string comparisons, the ``matches`` operator allows you to use
+ `regular expressions`_:
+
+ .. code-block:: twig
+
+ {% if phone matches '/^[\\d\\.]+$/' %}
+ {% endif %}
+
+Containment Operator
+~~~~~~~~~~~~~~~~~~~~
+
+The ``in`` operator performs containment test. It returns ``true`` if the left
+operand is contained in the right:
+
+.. code-block:: twig
+
+ {# returns true #}
+
+ {{ 1 in [1, 2, 3] }}
+
+ {{ 'cd' in 'abcde' }}
+
+.. tip::
+
+ You can use this filter to perform a containment test on strings, arrays,
+ or objects implementing the ``Traversable`` interface.
+
+To perform a negative test, use the ``not in`` operator:
+
+.. code-block:: twig
+
+ {% if 1 not in [1, 2, 3] %}
+
+ {# is equivalent to #}
+ {% if not (1 in [1, 2, 3]) %}
+
+Test Operator
+~~~~~~~~~~~~~
+
+The ``is`` operator performs tests. Tests can be used to test a variable against
+a common expression. The right operand is name of the test:
+
+.. code-block:: twig
+
+ {# find out if a variable is odd #}
+
+ {{ name is odd }}
+
+Tests can accept arguments too:
+
+.. code-block:: twig
+
+ {% if post.status is constant('Post::PUBLISHED') %}
+
+Tests can be negated by using the ``is not`` operator:
+
+.. code-block:: twig
+
+ {% if post.status is not constant('Post::PUBLISHED') %}
+
+ {# is equivalent to #}
+ {% if not (post.status is constant('Post::PUBLISHED')) %}
+
+Go to the :doc:`tests` page to learn more about the built-in
+tests.
+
+Other Operators
+~~~~~~~~~~~~~~~
+
+The following operators don't fit into any of the other categories:
+
+* ``|``: Applies a filter.
+
+* ``..``: Creates a sequence based on the operand before and after the operator
+ (this is syntactic sugar for the :doc:`range` function):
+
+ .. code-block:: twig
+
+ {{ 1..5 }}
+
+ {# equivalent to #}
+ {{ range(1, 5) }}
+
+ Note that you must use parentheses when combining it with the filter operator
+ due to the :ref:`operator precedence rules `:
+
+ .. code-block:: twig
+
+ (1..5)|join(', ')
+
+* ``~``: Converts all operands into strings and concatenates them. ``{{ "Hello
+ " ~ name ~ "!" }}`` would return (assuming ``name`` is ``'John'``) ``Hello
+ John!``.
+
+* ``.``, ``[]``: Gets an attribute of a variable.
+
+* ``?:``: The ternary operator:
+
+ .. code-block:: twig
+
+ {{ foo ? 'yes' : 'no' }}
+ {{ foo ?: 'no' }} is the same as {{ foo ? foo : 'no' }}
+ {{ foo ? 'yes' }} is the same as {{ foo ? 'yes' : '' }}
+
+* ``??``: The null-coalescing operator:
+
+ .. code-block:: twig
+
+ {# returns the value of foo if it is defined and not null, 'no' otherwise #}
+ {{ foo ?? 'no' }}
+
+.. _templates-string-interpolation:
+
+String Interpolation
+~~~~~~~~~~~~~~~~~~~~
+
+String interpolation (``#{expression}``) allows any valid expression to appear
+within a *double-quoted string*. The result of evaluating that expression is
+inserted into the string:
+
+.. code-block:: twig
+
+ {{ "foo #{bar} baz" }}
+ {{ "foo #{1 + 2} baz" }}
+
+.. _templates-whitespace-control:
+
+Whitespace Control
+------------------
+
+.. versionadded:: 2.8
+ Tag level Line whitespace control was added in Twig 2.8.
+
+The first newline after a template tag is removed automatically (like in PHP).
+Whitespace is not further modified by the template engine, so each whitespace
+(spaces, tabs, newlines etc.) is returned unchanged.
+
+You can also control whitespace on a per tag level. By using the whitespace
+control modifiers on your tags, you can trim leading and or trailing whitespace.
+
+Twig supports two modifiers:
+
+* *Whitespace trimming* via the ``-`` modifier: Removes all whitespace
+ (including newlines);
+
+* *Line whitespace trimming* via the ``~`` modifier: Removes all whitespace
+ (excluding newlines). Using this modifier on the right disables the default
+ removal of the first newline inherited from PHP.
+
+The modifiers can be used on either side of the tags like in ``{%-`` or ``-%}``
+and they consume all whitespace for that side of the tag. It is possible to use
+the modifiers on one side of a tag or on both sides:
+
+.. code-block:: twig
+
+ {% set value = 'no spaces' %}
+ {#- No leading/trailing whitespace -#}
+ {%- if true -%}
+ {{- value -}}
+ {%- endif -%}
+ {# output 'no spaces' #}
+
+
+ {{ value }}
+ {# outputs '\n no spaces ' #}
+
+
+ {{- value }}
+ {# outputs 'no spaces ' #}
+
+
+ {{~ value }}
+ {# outputs '\nno spaces ' #}
+
+.. tip::
+
+ In addition to the whitespace modifiers, Twig also has a ``spaceless`` filter
+ that removes whitespace **between HTML tags**:
+
+ .. code-block:: twig
+
+ {% apply spaceless %}
+
+ foo bar
+
+ {% endapply %}
+
+ {# output will be foo bar
#}
+
+ The ``apply`` tag was introduced in Twig 2.9; use the ``filter`` tag with
+ previous versions.
+
+Extensions
+----------
+
+Twig can be extended. If you are looking for new tags, filters, or functions,
+have a look at the Twig official `extension repository`_.
+
+If you want to create your own, read the :ref:`Creating an
+Extension` chapter.
+
+.. _`Twig bundle`: https://github.com/Anomareh/PHP-Twig.tmbundle
+.. _`Jinja syntax plugin`: http://jinja.pocoo.org/docs/integration/#vim
+.. _`vim-twig plugin`: https://github.com/lumiliet/vim-twig
+.. _`Twig syntax plugin`: http://plugins.netbeans.org/plugin/37069/php-twig
+.. _`Twig plugin`: https://github.com/pulse00/Twig-Eclipse-Plugin
+.. _`Twig language definition`: https://github.com/gabrielcorpse/gedit-twig-template-language
+.. _`extension repository`: https://github.com/twigphp/Twig-extensions
+.. _`Twig syntax mode`: https://github.com/bobthecow/Twig-HTML.mode
+.. _`other Twig syntax mode`: https://github.com/muxx/Twig-HTML.mode
+.. _`Notepad++ Twig Highlighter`: https://github.com/Banane9/notepadplusplus-twig
+.. _`web-mode.el`: http://web-mode.org/
+.. _`regular expressions`: https://secure.php.net/manual/en/pcre.pattern.php
+.. _`PHP-twig for atom`: https://github.com/reesef/php-twig
+.. _`TwigFiddle`: https://twigfiddle.com/
+.. _`Twig pack`: https://marketplace.visualstudio.com/items?itemName=bajdzis.vscode-twig-pack
diff --git a/app/vendor/twig/twig/doc/tests/constant.rst b/app/vendor/twig/twig/doc/tests/constant.rst
new file mode 100644
index 0000000..448c238
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/constant.rst
@@ -0,0 +1,19 @@
+``constant``
+============
+
+``constant`` checks if a variable has the exact same value as a constant. You
+can use either global constants or class constants:
+
+.. code-block:: twig
+
+ {% if post.status is constant('Post::PUBLISHED') %}
+ the status attribute is exactly the same as Post::PUBLISHED
+ {% endif %}
+
+You can test constants from object instances as well:
+
+.. code-block:: twig
+
+ {% if post.status is constant('PUBLISHED', post) %}
+ the status attribute is exactly the same as Post::PUBLISHED
+ {% endif %}
diff --git a/app/vendor/twig/twig/doc/tests/defined.rst b/app/vendor/twig/twig/doc/tests/defined.rst
new file mode 100644
index 0000000..234a289
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/defined.rst
@@ -0,0 +1,30 @@
+``defined``
+===========
+
+``defined`` checks if a variable is defined in the current context. This is very
+useful if you use the ``strict_variables`` option:
+
+.. code-block:: twig
+
+ {# defined works with variable names #}
+ {% if foo is defined %}
+ ...
+ {% endif %}
+
+ {# and attributes on variables names #}
+ {% if foo.bar is defined %}
+ ...
+ {% endif %}
+
+ {% if foo['bar'] is defined %}
+ ...
+ {% endif %}
+
+When using the ``defined`` test on an expression that uses variables in some
+method calls, be sure that they are all defined first:
+
+.. code-block:: twig
+
+ {% if var is defined and foo.method(var) is defined %}
+ ...
+ {% endif %}
diff --git a/app/vendor/twig/twig/doc/tests/divisibleby.rst b/app/vendor/twig/twig/doc/tests/divisibleby.rst
new file mode 100644
index 0000000..8032d34
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/divisibleby.rst
@@ -0,0 +1,10 @@
+``divisible by``
+================
+
+``divisible by`` checks if a variable is divisible by a number:
+
+.. code-block:: twig
+
+ {% if loop.index is divisible by(3) %}
+ ...
+ {% endif %}
diff --git a/app/vendor/twig/twig/doc/tests/empty.rst b/app/vendor/twig/twig/doc/tests/empty.rst
new file mode 100644
index 0000000..2cd2806
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/empty.rst
@@ -0,0 +1,22 @@
+``empty``
+=========
+
+.. versionadded:: 2.3
+
+ Support for the ``__toString()`` magic method has been added in Twig 2.3.
+
+``empty`` checks if a variable is an empty string, an empty array, an empty
+hash, exactly ``false``, or exactly ``null``.
+
+For objects that implement the ``Countable`` interface, ``empty`` will check the
+return value of the ``count()`` method.
+
+For objects that implement the ``__toString()`` magic method (and not ``Countable``),
+it will check if an empty string is returned.
+
+.. code-block:: twig
+
+ {% if foo is empty %}
+ ...
+ {% endif %}
+
diff --git a/app/vendor/twig/twig/doc/tests/even.rst b/app/vendor/twig/twig/doc/tests/even.rst
new file mode 100644
index 0000000..5d9c876
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/even.rst
@@ -0,0 +1,10 @@
+``even``
+========
+
+``even`` returns ``true`` if the given number is even:
+
+.. code-block:: twig
+
+ {{ var is even }}
+
+.. seealso:: :doc:`odd<../tests/odd>`
diff --git a/app/vendor/twig/twig/doc/tests/index.rst b/app/vendor/twig/twig/doc/tests/index.rst
new file mode 100644
index 0000000..c63208e
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/index.rst
@@ -0,0 +1,15 @@
+Tests
+=====
+
+.. toctree::
+ :maxdepth: 1
+
+ constant
+ defined
+ divisibleby
+ empty
+ even
+ iterable
+ null
+ odd
+ sameas
diff --git a/app/vendor/twig/twig/doc/tests/iterable.rst b/app/vendor/twig/twig/doc/tests/iterable.rst
new file mode 100644
index 0000000..4ebfe9d
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/iterable.rst
@@ -0,0 +1,16 @@
+``iterable``
+============
+
+``iterable`` checks if a variable is an array or a traversable object:
+
+.. code-block:: twig
+
+ {# evaluates to true if the foo variable is iterable #}
+ {% if users is iterable %}
+ {% for user in users %}
+ Hello {{ user }}!
+ {% endfor %}
+ {% else %}
+ {# users is probably a string #}
+ Hello {{ users }}!
+ {% endif %}
diff --git a/app/vendor/twig/twig/doc/tests/null.rst b/app/vendor/twig/twig/doc/tests/null.rst
new file mode 100644
index 0000000..9ed93f6
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/null.rst
@@ -0,0 +1,12 @@
+``null``
+========
+
+``null`` returns ``true`` if the variable is ``null``:
+
+.. code-block:: twig
+
+ {{ var is null }}
+
+.. note::
+
+ ``none`` is an alias for ``null``.
diff --git a/app/vendor/twig/twig/doc/tests/odd.rst b/app/vendor/twig/twig/doc/tests/odd.rst
new file mode 100644
index 0000000..0546f83
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/odd.rst
@@ -0,0 +1,10 @@
+``odd``
+=======
+
+``odd`` returns ``true`` if the given number is odd:
+
+.. code-block:: twig
+
+ {{ var is odd }}
+
+.. seealso:: :doc:`even<../tests/even>`
diff --git a/app/vendor/twig/twig/doc/tests/sameas.rst b/app/vendor/twig/twig/doc/tests/sameas.rst
new file mode 100644
index 0000000..cd2b1ad
--- /dev/null
+++ b/app/vendor/twig/twig/doc/tests/sameas.rst
@@ -0,0 +1,11 @@
+``same as``
+===========
+
+``same as`` checks if a variable is the same as another variable.
+This is the equivalent to ``===`` in PHP:
+
+.. code-block:: twig
+
+ {% if foo.attribute is same as(false) %}
+ the foo attribute really is the 'false' PHP value
+ {% endif %}
diff --git a/app/vendor/twig/twig/lib/Twig/Node/Block.php b/app/vendor/twig/twig/lib/Twig/Node/Block.php
new file mode 100644
index 0000000..51f6ff8
--- /dev/null
+++ b/app/vendor/twig/twig/lib/Twig/Node/Block.php
@@ -0,0 +1,14 @@
+=5.3.3",
- "symfony/symfony": "2.8.*",
- "doctrine/orm": "~2.2,>=2.2.3",
- "doctrine/doctrine-bundle": "~1.2",
- "twig/extensions": "~1.0",
- "symfony/assetic-bundle": "~2.3",
- "symfony/swiftmailer-bundle": "~2.3",
- "symfony/monolog-bundle": "~2.4",
- "sensio/distribution-bundle": "~3.0",
- "sensio/framework-extra-bundle": "~3.0",
- "incenteev/composer-parameter-handler": "~2.0",
- "friendsofsymfony/user-bundle": "~2.0@dev",
- "lrotherfield/form": "1.1.x-dev",
- "salavert/time-ago-in-words": "1.*",
- "phpseclib/phpseclib": "^2.0",
- "knplabs/knp-markdown-bundle": "~1.3",
- "knplabs/knp-paginator-bundle": "^2.5",
- "craue/twigextensions-bundle": "~2.0",
- "hwi/oauth-bundle": "^0.3.9",
- "knplabs/github-api": "^1.5",
- "m4tthumphrey/php-gitlab-api": "7.13.*",
- "doctrine/doctrine-cache-bundle": "^1.3"
- },
- "require-dev": {
- "sensio/generator-bundle": "~2.3"
- },
- "scripts": {
- "post-root-package-install": [
- "SymfonyStandard\\Composer::hookRootPackageInstall"
- ],
- "post-install-cmd": [
- "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles"
- ],
- "post-update-cmd": [
- "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::removeSymfonyStandardFiles"
- ]
- },
- "config": {
- "bin-dir": "bin"
- },
- "extra": {
- "symfony-app-dir": "app",
- "symfony-web-dir": "web",
- "incenteev-parameters": {
- "file": "app/config/parameters.yml"
- },
- "branch-alias": {
- "dev-master": "2.5-dev"
- }
- }
-}
diff --git a/composer.lock b/composer.lock
deleted file mode 100755
index e855cc5..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,3369 +0,0 @@
-{
- "_readme": [
- "This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
- "This file is @generated automatically"
- ],
- "hash": "be87404f3f48a0e5b25876856de33f6c",
- "content-hash": "4c17500227838f6b31b1d96c5b12b444",
- "packages": [
- {
- "name": "craue/twigextensions-bundle",
- "version": "2.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/craue/TwigExtensionsBundle.git",
- "reference": "1fee835480b2b904dfcced337daeedba070cbd49"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/craue/TwigExtensionsBundle/zipball/1fee835480b2b904dfcced337daeedba070cbd49",
- "reference": "1fee835480b2b904dfcced337daeedba070cbd49",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.2|~7.0",
- "symfony/twig-bundle": "~2.3|~3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.1|~5.0",
- "symfony/phpunit-bridge": "^2.8.1|^3.0.1",
- "symfony/symfony": "~2.3|~3.0"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Craue\\TwigExtensionsBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Christian Raue",
- "email": "christian.raue@gmail.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://github.com/craue/TwigExtensionsBundle/contributors"
- }
- ],
- "description": "Useful Twig extensions for your Symfony project.",
- "homepage": "https://github.com/craue/TwigExtensionsBundle",
- "keywords": [
- "Symfony2",
- "extensions",
- "symfony3",
- "twig"
- ],
- "time": "2015-12-29 22:47:03"
- },
- {
- "name": "doctrine/annotations",
- "version": "v1.2.7",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/annotations.git",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
- "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
- "shasum": ""
- },
- "require": {
- "doctrine/lexer": "1.*",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "doctrine/cache": "1.*",
- "phpunit/phpunit": "4.*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Annotations\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Docblock Annotations Parser",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "docblock",
- "parser"
- ],
- "time": "2015-08-31 12:32:49"
- },
- {
- "name": "doctrine/cache",
- "version": "v1.5.4",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/cache.git",
- "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/47cdc76ceb95cc591d9c79a36dc3794975b5d136",
- "reference": "47cdc76ceb95cc591d9c79a36dc3794975b5d136",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "conflict": {
- "doctrine/common": ">2.2,<2.4"
- },
- "require-dev": {
- "phpunit/phpunit": ">=3.7",
- "predis/predis": "~1.0",
- "satooshi/php-coveralls": "~0.6"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.5.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Caching library offering an object-oriented API for many cache backends",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "cache",
- "caching"
- ],
- "time": "2015-12-19 05:03:47"
- },
- {
- "name": "doctrine/collections",
- "version": "v1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/collections.git",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Collections\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Collections Abstraction library",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "array",
- "collections",
- "iterator"
- ],
- "time": "2015-04-14 22:21:58"
- },
- {
- "name": "doctrine/common",
- "version": "v2.5.3",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/common.git",
- "reference": "10f1f19651343f87573129ca970aef1a47a6f29e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/10f1f19651343f87573129ca970aef1a47a6f29e",
- "reference": "10f1f19651343f87573129ca970aef1a47a6f29e",
- "shasum": ""
- },
- "require": {
- "doctrine/annotations": "1.*",
- "doctrine/cache": "1.*",
- "doctrine/collections": "1.*",
- "doctrine/inflector": "1.*",
- "doctrine/lexer": "1.*",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~3.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.5.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Common Library for Doctrine projects",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "annotations",
- "collections",
- "eventmanager",
- "persistence",
- "spl"
- ],
- "time": "2015-12-25 13:10:16"
- },
- {
- "name": "doctrine/dbal",
- "version": "v2.5.4",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/dbal.git",
- "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
- "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
- "shasum": ""
- },
- "require": {
- "doctrine/common": ">=2.4,<2.7-dev",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*",
- "symfony/console": "2.*"
- },
- "suggest": {
- "symfony/console": "For helpful console commands such as SQL execution and import of files."
- },
- "bin": [
- "bin/doctrine-dbal"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.5.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\DBAL\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- }
- ],
- "description": "Database Abstraction Layer",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "database",
- "dbal",
- "persistence",
- "queryobject"
- ],
- "time": "2016-01-05 22:11:12"
- },
- {
- "name": "doctrine/doctrine-bundle",
- "version": "1.6.2",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/e9c2ccf573b59b7cea566390f34254fed3c20ed9",
- "reference": "e9c2ccf573b59b7cea566390f34254fed3c20ed9",
- "shasum": ""
- },
- "require": {
- "doctrine/dbal": "~2.3",
- "doctrine/doctrine-cache-bundle": "~1.0",
- "jdorn/sql-formatter": "~1.1",
- "php": ">=5.3.2",
- "symfony/console": "~2.3|~3.0",
- "symfony/doctrine-bridge": "~2.2|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0"
- },
- "require-dev": {
- "doctrine/orm": "~2.3",
- "phpunit/phpunit": "~4",
- "satooshi/php-coveralls": "~0.6.1",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/validator": "~2.2|~3.0",
- "symfony/yaml": "~2.2|~3.0",
- "twig/twig": "~1.10"
- },
- "suggest": {
- "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
- "symfony/web-profiler-bundle": "to use the data collector"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.6.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Bundle\\DoctrineBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Doctrine Project",
- "homepage": "http://www.doctrine-project.org/"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony DoctrineBundle",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "database",
- "dbal",
- "orm",
- "persistence"
- ],
- "time": "2016-01-10 17:21:44"
- },
- {
- "name": "doctrine/doctrine-cache-bundle",
- "version": "1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
- "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/18c600a9b82f6454d2e81ca4957cdd56a1cf3504",
- "reference": "18c600a9b82f6454d2e81ca4957cdd56a1cf3504",
- "shasum": ""
- },
- "require": {
- "doctrine/cache": "^1.4.2",
- "doctrine/inflector": "~1.0",
- "php": ">=5.3.2",
- "symfony/doctrine-bridge": "~2.2|~3.0"
- },
- "require-dev": {
- "instaclick/coding-standard": "~1.1",
- "instaclick/object-calisthenics-sniffs": "dev-master",
- "instaclick/symfony2-coding-standard": "dev-remaster",
- "phpunit/phpunit": "~4",
- "predis/predis": "~0.8",
- "satooshi/php-coveralls": "~0.6.1",
- "squizlabs/php_codesniffer": "~1.5",
- "symfony/console": "~2.2|~3.0",
- "symfony/finder": "~2.2|~3.0",
- "symfony/framework-bundle": "~2.2|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/security-acl": "~2.3|~3.0",
- "symfony/validator": "~2.2|~3.0",
- "symfony/yaml": "~2.2|~3.0"
- },
- "suggest": {
- "symfony/security-acl": "For using this bundle to cache ACLs"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Bundle\\DoctrineCacheBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Fabio B. Silva",
- "email": "fabio.bat.silva@gmail.com"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@hotmail.com"
- },
- {
- "name": "Doctrine Project",
- "homepage": "http://www.doctrine-project.org/"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony Bundle for Doctrine Cache",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "cache",
- "caching"
- ],
- "time": "2016-01-26 17:28:51"
- },
- {
- "name": "doctrine/inflector",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/inflector.git",
- "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
- "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Inflector\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Common String Manipulations with regard to casing and singular/plural rules.",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "inflection",
- "pluralize",
- "singularize",
- "string"
- ],
- "time": "2015-11-06 14:35:42"
- },
- {
- "name": "doctrine/instantiator",
- "version": "1.0.5",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3,<8.0-DEV"
- },
- "require-dev": {
- "athletic/athletic": "~0.1.8",
- "ext-pdo": "*",
- "ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
- }
- ],
- "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://github.com/doctrine/instantiator",
- "keywords": [
- "constructor",
- "instantiate"
- ],
- "time": "2015-06-14 21:17:01"
- },
- {
- "name": "doctrine/lexer",
- "version": "v1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/lexer.git",
- "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
- "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\Common\\Lexer\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
- "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "lexer",
- "parser"
- ],
- "time": "2014-09-09 13:34:57"
- },
- {
- "name": "doctrine/orm",
- "version": "v2.5.4",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/doctrine2.git",
- "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
- "reference": "bc4ddbfb0114cb33438cc811c9a740d8aa304aab",
- "shasum": ""
- },
- "require": {
- "doctrine/cache": "~1.4",
- "doctrine/collections": "~1.2",
- "doctrine/common": ">=2.5-dev,<2.7-dev",
- "doctrine/dbal": ">=2.5-dev,<2.6-dev",
- "doctrine/instantiator": "~1.0.1",
- "ext-pdo": "*",
- "php": ">=5.4",
- "symfony/console": "~2.5|~3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0",
- "symfony/yaml": "~2.3|~3.0"
- },
- "suggest": {
- "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
- },
- "bin": [
- "bin/doctrine",
- "bin/doctrine.php"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Doctrine\\ORM\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Roman Borschel",
- "email": "roman@code-factory.org"
- },
- {
- "name": "Benjamin Eberlei",
- "email": "kontakt@beberlei.de"
- },
- {
- "name": "Guilherme Blanco",
- "email": "guilhermeblanco@gmail.com"
- },
- {
- "name": "Jonathan Wage",
- "email": "jonwage@gmail.com"
- }
- ],
- "description": "Object-Relational-Mapper for PHP",
- "homepage": "http://www.doctrine-project.org",
- "keywords": [
- "database",
- "orm"
- ],
- "time": "2016-01-05 21:34:58"
- },
- {
- "name": "friendsofsymfony/user-bundle",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
- "reference": "a39d000577d735444bee97de9f5ee382e3f85fa1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/d1fccc6335b74beca94525551cacc06b256ed261",
- "reference": "a39d000577d735444bee97de9f5ee382e3f85fa1",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.9",
- "symfony/form": "~2.3|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0",
- "symfony/security-bundle": "~2.3|~3.0",
- "symfony/twig-bundle": "~2.3|~3.0"
- },
- "require-dev": {
- "doctrine/doctrine-bundle": "~1.3",
- "swiftmailer/swiftmailer": "~4.3|~5",
- "symfony/console": "~2.3|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/validator": "~2.3|~3.0",
- "symfony/yaml": "~2.3|~3.0",
- "willdurand/propel-typehintable-behavior": "~1.0"
- },
- "suggest": {
- "willdurand/propel-typehintable-behavior": "Needed when using the propel implementation"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "FOS\\UserBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Christophe Coevoet",
- "email": "stof@notk.org"
- },
- {
- "name": "FriendsOfSymfony Community",
- "homepage": "https://github.com/friendsofsymfony/FOSUserBundle/contributors"
- },
- {
- "name": "Thibault Duplessis",
- "email": "thibault.duplessis@gmail.com"
- }
- ],
- "description": "Symfony FOSUserBundle",
- "homepage": "http://friendsofsymfony.github.com",
- "keywords": [
- "User management"
- ],
- "time": "2016-03-01 11:42:24"
- },
- {
- "name": "guzzle/guzzle",
- "version": "v3.9.3",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/guzzle3.git",
- "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
- "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "php": ">=5.3.3",
- "symfony/event-dispatcher": "~2.1"
- },
- "replace": {
- "guzzle/batch": "self.version",
- "guzzle/cache": "self.version",
- "guzzle/common": "self.version",
- "guzzle/http": "self.version",
- "guzzle/inflection": "self.version",
- "guzzle/iterator": "self.version",
- "guzzle/log": "self.version",
- "guzzle/parser": "self.version",
- "guzzle/plugin": "self.version",
- "guzzle/plugin-async": "self.version",
- "guzzle/plugin-backoff": "self.version",
- "guzzle/plugin-cache": "self.version",
- "guzzle/plugin-cookie": "self.version",
- "guzzle/plugin-curlauth": "self.version",
- "guzzle/plugin-error-response": "self.version",
- "guzzle/plugin-history": "self.version",
- "guzzle/plugin-log": "self.version",
- "guzzle/plugin-md5": "self.version",
- "guzzle/plugin-mock": "self.version",
- "guzzle/plugin-oauth": "self.version",
- "guzzle/service": "self.version",
- "guzzle/stream": "self.version"
- },
- "require-dev": {
- "doctrine/cache": "~1.3",
- "monolog/monolog": "~1.0",
- "phpunit/phpunit": "3.7.*",
- "psr/log": "~1.0",
- "symfony/class-loader": "~2.1",
- "zendframework/zend-cache": "2.*,<2.3",
- "zendframework/zend-log": "2.*,<2.3"
- },
- "suggest": {
- "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.9-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Guzzle": "src/",
- "Guzzle\\Tests": "tests/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "Guzzle Community",
- "homepage": "https://github.com/guzzle/guzzle/contributors"
- }
- ],
- "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
- "homepage": "http://guzzlephp.org/",
- "keywords": [
- "client",
- "curl",
- "framework",
- "http",
- "http client",
- "rest",
- "web service"
- ],
- "time": "2015-03-18 18:23:50"
- },
- {
- "name": "hwi/oauth-bundle",
- "version": "0.3.9",
- "target-dir": "HWI/Bundle/OAuthBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/hwi/HWIOAuthBundle.git",
- "reference": "ff5d2e3a5af9f665cebd375777ffb8ae437d9262"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/ff5d2e3a5af9f665cebd375777ffb8ae437d9262",
- "reference": "ff5d2e3a5af9f665cebd375777ffb8ae437d9262",
- "shasum": ""
- },
- "require": {
- "kriswallsmith/buzz": "~0.7",
- "php": ">=5.3.3",
- "symfony/framework-bundle": "~2.1",
- "symfony/options-resolver": "~2.1",
- "symfony/security-bundle": "~2.1"
- },
- "conflict": {
- "twig/twig": "<1.12"
- },
- "require-dev": {
- "doctrine/orm": "~2.2",
- "symfony/property-access": "~2.3",
- "symfony/twig-bundle": "~2.1",
- "symfony/validator": "~2.1"
- },
- "suggest": {
- "doctrine/doctrine-bundle": "to use Doctrine user provider",
- "friendsofsymfony/user-bundle": "to connect FOSUB with this bundle",
- "symfony/property-access": "to use FOSUB integration with this bundle",
- "symfony/twig-bundle": "to use the Twig hwi_oauth_* functions"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "0.3-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "HWI\\Bundle\\OAuthBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Contributors",
- "homepage": "https://github.com/hwi/HWIOAuthBundle/contributors"
- },
- {
- "name": "Joseph Bielawski",
- "email": "stloyd@gmail.com"
- },
- {
- "name": "Alexander",
- "email": "iam.asm89@gmail.com"
- },
- {
- "name": "Geoffrey Bachelet",
- "email": "geoffrey.bachelet@gmail.com"
- }
- ],
- "description": "Support for authenticating users using both OAuth1.0a and OAuth2 in Symfony2.",
- "homepage": "http://github.com/hwi/HWIOAuthBundle",
- "keywords": [
- "37signals",
- "Authentication",
- "amazon",
- "bitbucket",
- "bitly",
- "box",
- "dailymotion",
- "deviantart",
- "disqus",
- "dropbox",
- "eventbrite",
- "facebook",
- "firewall",
- "flickr",
- "foursquare",
- "github",
- "google",
- "instagram",
- "jira",
- "linkedin",
- "mail.ru",
- "oauth",
- "oauth1",
- "oauth2",
- "odnoklassniki",
- "qq",
- "salesforce",
- "security",
- "sensio connect",
- "sina weibo",
- "stack exchange",
- "stereomood",
- "trello",
- "twitch",
- "twitter",
- "vkontakte",
- "windows live",
- "wordpress",
- "yahoo",
- "yandex"
- ],
- "time": "2015-08-28 09:57:17"
- },
- {
- "name": "incenteev/composer-parameter-handler",
- "version": "v2.1.2",
- "source": {
- "type": "git",
- "url": "https://github.com/Incenteev/ParameterHandler.git",
- "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
- "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "symfony/yaml": "~2.3|~3.0"
- },
- "require-dev": {
- "composer/composer": "1.0.*@dev",
- "phpspec/prophecy-phpunit": "~1.0",
- "symfony/filesystem": "~2.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Incenteev\\ParameterHandler\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Christophe Coevoet",
- "email": "stof@notk.org"
- }
- ],
- "description": "Composer script handling your ignored parameter file",
- "homepage": "https://github.com/Incenteev/ParameterHandler",
- "keywords": [
- "parameters management"
- ],
- "time": "2015-11-10 17:04:01"
- },
- {
- "name": "ircmaxell/password-compat",
- "version": "v1.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/ircmaxell/password_compat.git",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
- "shasum": ""
- },
- "require-dev": {
- "phpunit/phpunit": "4.*"
- },
- "type": "library",
- "autoload": {
- "files": [
- "lib/password.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Anthony Ferrara",
- "email": "ircmaxell@php.net",
- "homepage": "http://blog.ircmaxell.com"
- }
- ],
- "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
- "homepage": "https://github.com/ircmaxell/password_compat",
- "keywords": [
- "hashing",
- "password"
- ],
- "time": "2014-11-20 16:49:30"
- },
- {
- "name": "jdorn/sql-formatter",
- "version": "v1.2.17",
- "source": {
- "type": "git",
- "url": "https://github.com/jdorn/sql-formatter.git",
- "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc",
- "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.4"
- },
- "require-dev": {
- "phpunit/phpunit": "3.7.*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "lib"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jeremy Dorn",
- "email": "jeremy@jeremydorn.com",
- "homepage": "http://jeremydorn.com/"
- }
- ],
- "description": "a PHP SQL highlighting library",
- "homepage": "https://github.com/jdorn/sql-formatter/",
- "keywords": [
- "highlight",
- "sql"
- ],
- "time": "2014-01-12 16:20:24"
- },
- {
- "name": "knplabs/github-api",
- "version": "1.6.0",
- "source": {
- "type": "git",
- "url": "https://github.com/KnpLabs/php-github-api.git",
- "reference": "5720f828ea241eded6c6263249fa00b0a37650f4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/5720f828ea241eded6c6263249fa00b0a37650f4",
- "reference": "5720f828ea241eded6c6263249fa00b0a37650f4",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "guzzle/guzzle": "~3.7",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0",
- "sllh/php-cs-fixer-styleci-bridge": "~1.3"
- },
- "suggest": {
- "knplabs/gaufrette": "Needed for optional Gaufrette cache"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.5.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Github\\": "lib/Github/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Thibault Duplessis",
- "email": "thibault.duplessis@gmail.com",
- "homepage": "http://ornicar.github.com"
- },
- {
- "name": "KnpLabs Team",
- "homepage": "http://knplabs.com"
- }
- ],
- "description": "GitHub API v3 client",
- "homepage": "https://github.com/KnpLabs/php-github-api",
- "keywords": [
- "api",
- "gh",
- "gist",
- "github"
- ],
- "time": "2016-02-24 05:52:33"
- },
- {
- "name": "knplabs/knp-components",
- "version": "1.3.2",
- "source": {
- "type": "git",
- "url": "https://github.com/KnpLabs/knp-components.git",
- "reference": "4503275e4f1a0e9667aa65b0ebed842ef2d8d8ba"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/4503275e4f1a0e9667aa65b0ebed842ef2d8d8ba",
- "reference": "4503275e4f1a0e9667aa65b0ebed842ef2d8d8ba",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "require-dev": {
- "doctrine/mongodb-odm": "~1.0@beta",
- "doctrine/orm": "~2.4",
- "phpunit/phpunit": "~4.2",
- "ruflin/elastica": "~1.0",
- "symfony/event-dispatcher": "~2.5"
- },
- "suggest": {
- "doctrine/common": "to allow usage pagination with Doctrine ArrayCollection",
- "doctrine/mongodb-odm": "to allow usage pagination with Doctrine ODM MongoDB",
- "doctrine/orm": "to allow usage pagination with Doctrine ORM",
- "propel/propel1": "to allow usage pagination with Propel ORM",
- "ruflin/Elastica": "to allow usage pagination with ElasticSearch Client",
- "solarium/solarium": "to allow usage pagination with Solarium Client"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Knp\\Component": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "KnpLabs Team",
- "homepage": "http://knplabs.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://github.com/KnpLabs/knp-components/contributors"
- }
- ],
- "description": "Knplabs component library",
- "homepage": "http://github.com/KnpLabs/knp-components",
- "keywords": [
- "components",
- "knp",
- "knplabs",
- "pager",
- "paginator"
- ],
- "time": "2015-09-01 10:54:53"
- },
- {
- "name": "knplabs/knp-markdown-bundle",
- "version": "1.4.2",
- "source": {
- "type": "git",
- "url": "https://github.com/KnpLabs/KnpMarkdownBundle.git",
- "reference": "27d6c8c866a5fef70df3f219e6c2afab25e145ce"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/KnpLabs/KnpMarkdownBundle/zipball/27d6c8c866a5fef70df3f219e6c2afab25e145ce",
- "reference": "27d6c8c866a5fef70df3f219e6c2afab25e145ce",
- "shasum": ""
- },
- "require": {
- "michelf/php-markdown": "~1.4",
- "php": ">=5.3.9",
- "symfony/framework-bundle": "~2.3|~3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.5"
- },
- "suggest": {
- "ext-sundown": "to use optional support for php-sundown extension instead of php implementation",
- "symfony/twig-bundle": "to use the Twig markdown filter"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.4.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Knp\\Bundle\\MarkdownBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "KnpLabs Team",
- "homepage": "http://knplabs.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle/contributors"
- }
- ],
- "description": "Knplabs markdown bundle transforms markdown into html",
- "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle",
- "keywords": [
- "bundle",
- "knp",
- "knplabs",
- "markdown"
- ],
- "time": "2015-12-15 20:41:45"
- },
- {
- "name": "knplabs/knp-paginator-bundle",
- "version": "2.5.1",
- "source": {
- "type": "git",
- "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git",
- "reference": "5147740faff4d32e6f42acf64475314c35320fa4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/5147740faff4d32e6f42acf64475314c35320fa4",
- "reference": "5147740faff4d32e6f42acf64475314c35320fa4",
- "shasum": ""
- },
- "require": {
- "knplabs/knp-components": "~1.2",
- "php": ">=5.3.3",
- "symfony/framework-bundle": "~2.3|~3.0",
- "twig/twig": "~1.12|~2"
- },
- "require-dev": {
- "symfony/expression-language": "~2.4|~3.0"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.4.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Knp\\Bundle\\PaginatorBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "KnpLabs Team",
- "homepage": "http://knplabs.com"
- },
- {
- "name": "Symfony2 Community",
- "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle/contributors"
- }
- ],
- "description": "Paginator bundle for Symfony2 to automate pagination and simplify sorting and other features",
- "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle",
- "keywords": [
- "Symfony2",
- "bundle",
- "knp",
- "knplabs",
- "pager",
- "pagination",
- "paginator"
- ],
- "time": "2015-11-23 17:51:40"
- },
- {
- "name": "kriswallsmith/assetic",
- "version": "v1.3.2",
- "source": {
- "type": "git",
- "url": "https://github.com/kriswallsmith/assetic.git",
- "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5",
- "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.1",
- "symfony/process": "~2.1|~3.0"
- },
- "conflict": {
- "twig/twig": "<1.23"
- },
- "require-dev": {
- "cssmin/cssmin": "3.0.1",
- "joliclic/javascript-packer": "1.1",
- "kamicane/packager": "1.0",
- "leafo/lessphp": "^0.3.7",
- "leafo/scssphp": "~0.1",
- "mrclay/minify": "~2.2",
- "patchwork/jsqueeze": "~1.0|~2.0",
- "phpunit/phpunit": "~4.8",
- "psr/log": "~1.0",
- "ptachoire/cssembed": "~1.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "twig/twig": "~1.8|~2.0"
- },
- "suggest": {
- "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
- "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
- "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin",
- "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor",
- "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
- "twig/twig": "Assetic provides the integration with the Twig templating engine"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.4-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Assetic": "src/"
- },
- "files": [
- "src/functions.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Kris Wallsmith",
- "email": "kris.wallsmith@gmail.com",
- "homepage": "http://kriswallsmith.net/"
- }
- ],
- "description": "Asset Management for PHP",
- "homepage": "https://github.com/kriswallsmith/assetic",
- "keywords": [
- "assets",
- "compression",
- "minification"
- ],
- "time": "2015-11-12 13:51:40"
- },
- {
- "name": "kriswallsmith/buzz",
- "version": "v0.15",
- "source": {
- "type": "git",
- "url": "https://github.com/kriswallsmith/Buzz.git",
- "reference": "d4041666c3ffb379af02a92dabe81c904b35fab8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/kriswallsmith/Buzz/zipball/d4041666c3ffb379af02a92dabe81c904b35fab8",
- "reference": "d4041666c3ffb379af02a92dabe81c904b35fab8",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "3.7.*"
- },
- "suggest": {
- "ext-curl": "*"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Buzz": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Kris Wallsmith",
- "email": "kris.wallsmith@gmail.com",
- "homepage": "http://kriswallsmith.net/"
- }
- ],
- "description": "Lightweight HTTP client",
- "homepage": "https://github.com/kriswallsmith/Buzz",
- "keywords": [
- "curl",
- "http client"
- ],
- "time": "2015-06-25 17:26:56"
- },
- {
- "name": "lrotherfield/form",
- "version": "dev-master",
- "target-dir": "Lrotherfield/Component/Form",
- "source": {
- "type": "git",
- "url": "https://github.com/LRotherfield/Form.git",
- "reference": "78f5b89a6543cffe566f38a7b09e1f28050ecabb"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/LRotherfield/Form/zipball/78f5b89a6543cffe566f38a7b09e1f28050ecabb",
- "reference": "78f5b89a6543cffe566f38a7b09e1f28050ecabb",
- "shasum": ""
- },
- "require": {
- "doctrine/common": ">=2.2",
- "php": ">=5.3.2",
- "symfony/form": ">=2.2"
- },
- "type": "symfony2-component",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Lrotherfield\\Component\\Form\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Luke Rotherfield",
- "email": "luke@lrotherfield.com"
- }
- ],
- "description": "Additional components for the Symfony2 form components",
- "keywords": [
- "form"
- ],
- "time": "2016-02-19 15:21:09"
- },
- {
- "name": "m4tthumphrey/php-gitlab-api",
- "version": "7.13.0",
- "source": {
- "type": "git",
- "url": "https://github.com/m4tthumphrey/php-gitlab-api.git",
- "reference": "65dc67929188f26e2059e99deb56e9c5608232b5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/m4tthumphrey/php-gitlab-api/zipball/65dc67929188f26e2059e99deb56e9c5608232b5",
- "reference": "65dc67929188f26e2059e99deb56e9c5608232b5",
- "shasum": ""
- },
- "require": {
- "ext-curl": "*",
- "kriswallsmith/buzz": ">=0.7",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.5"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Gitlab\\": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Thibault Duplessis",
- "email": "thibault.duplessis@gmail.com",
- "homepage": "http://ornicar.github.com"
- },
- {
- "name": "KnpLabs Team",
- "homepage": "http://knplabs.com"
- },
- {
- "name": "Matt Humphrey",
- "homepage": "http://m4tt.io"
- }
- ],
- "description": "GitLab API client",
- "homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
- "keywords": [
- "api",
- "gitlab"
- ],
- "time": "2015-07-28 11:27:19"
- },
- {
- "name": "michelf/php-markdown",
- "version": "1.6.0",
- "source": {
- "type": "git",
- "url": "https://github.com/michelf/php-markdown.git",
- "reference": "156e56ee036505ec637d761ee62dc425d807183c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
- "reference": "156e56ee036505ec637d761ee62dc425d807183c",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-lib": "1.4.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Michelf": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Michel Fortin",
- "email": "michel.fortin@michelf.ca",
- "homepage": "https://michelf.ca/",
- "role": "Developer"
- },
- {
- "name": "John Gruber",
- "homepage": "https://daringfireball.net/"
- }
- ],
- "description": "PHP Markdown",
- "homepage": "https://michelf.ca/projects/php-markdown/",
- "keywords": [
- "markdown"
- ],
- "time": "2015-12-24 01:37:31"
- },
- {
- "name": "monolog/monolog",
- "version": "1.18.1",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
- "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "psr/log": "~1.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0"
- },
- "require-dev": {
- "aws/aws-sdk-php": "^2.4.9",
- "doctrine/couchdb": "~1.0@dev",
- "graylog2/gelf-php": "~1.0",
- "jakub-onderka/php-parallel-lint": "0.9",
- "php-console/php-console": "^3.1.3",
- "phpunit/phpunit": "~4.5",
- "phpunit/phpunit-mock-objects": "2.3.0",
- "raven/raven": "^0.13",
- "ruflin/elastica": ">=0.90 <3.0",
- "swiftmailer/swiftmailer": "~5.3",
- "videlalvaro/php-amqplib": "~2.4"
- },
- "suggest": {
- "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
- "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
- "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
- "ext-mongo": "Allow sending log messages to a MongoDB server",
- "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
- "php-console/php-console": "Allow sending log messages to Google Chrome",
- "raven/raven": "Allow sending log messages to a Sentry server",
- "rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
- "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Monolog\\": "src/Monolog"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
- ],
- "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
- "homepage": "http://github.com/Seldaek/monolog",
- "keywords": [
- "log",
- "logging",
- "psr-3"
- ],
- "time": "2016-03-13 16:08:35"
- },
- {
- "name": "paragonie/random_compat",
- "version": "v1.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/paragonie/random_compat.git",
- "reference": "f078eba3bcf140fd69b5fcc3ea5ac809abf729dc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/f078eba3bcf140fd69b5fcc3ea5ac809abf729dc",
- "reference": "f078eba3bcf140fd69b5fcc3ea5ac809abf729dc",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*|5.*"
- },
- "suggest": {
- "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
- },
- "type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Paragon Initiative Enterprises",
- "email": "security@paragonie.com",
- "homepage": "https://paragonie.com"
- }
- ],
- "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
- "keywords": [
- "csprng",
- "pseudorandom",
- "random"
- ],
- "time": "2016-02-29 17:25:04"
- },
- {
- "name": "phpseclib/phpseclib",
- "version": "2.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "ba6fb78f727cd09f2a649113b95468019e490585"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ba6fb78f727cd09f2a649113b95468019e490585",
- "reference": "ba6fb78f727cd09f2a649113b95468019e490585",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "phing/phing": "~2.7",
- "phpunit/phpunit": "~4.0",
- "sami/sami": "~2.0",
- "squizlabs/php_codesniffer": "~2.0"
- },
- "suggest": {
- "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
- "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
- "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
- "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "phpseclib\\": "phpseclib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jim Wigginton",
- "email": "terrafrost@php.net",
- "role": "Lead Developer"
- },
- {
- "name": "Patrick Monnerat",
- "email": "pm@datasphere.ch",
- "role": "Developer"
- },
- {
- "name": "Andreas Fischer",
- "email": "bantu@phpbb.com",
- "role": "Developer"
- },
- {
- "name": "Hans-Jürgen Petrich",
- "email": "petrich@tronic-media.com",
- "role": "Developer"
- },
- {
- "name": "Graham Campbell",
- "email": "graham@alt-three.com",
- "role": "Developer"
- }
- ],
- "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
- "homepage": "http://phpseclib.sourceforge.net",
- "keywords": [
- "BigInteger",
- "aes",
- "asn.1",
- "asn1",
- "blowfish",
- "crypto",
- "cryptography",
- "encryption",
- "rsa",
- "security",
- "sftp",
- "signature",
- "signing",
- "ssh",
- "twofish",
- "x.509",
- "x509"
- ],
- "time": "2016-01-18 17:07:21"
- },
- {
- "name": "psr/log",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
- "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
- "shasum": ""
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Psr\\Log\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
- "description": "Common interface for logging libraries",
- "keywords": [
- "log",
- "psr",
- "psr-3"
- ],
- "time": "2012-12-21 11:40:51"
- },
- {
- "name": "salavert/time-ago-in-words",
- "version": "v1.6.2",
- "source": {
- "type": "git",
- "url": "https://github.com/salavert/time-ago-in-words.git",
- "reference": "1e2d9f01dee90790057aee7f3370a289c33f52c6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/salavert/time-ago-in-words/zipball/1e2d9f01dee90790057aee7f3370a289c33f52c6",
- "reference": "1e2d9f01dee90790057aee7f3370a289c33f52c6",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0",
- "twig/twig": "~1.12"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0",
- "symfony/symfony": "2.*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Salavert": "src/",
- "Salavert\\Test": "tests/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jose Salavert",
- "email": "salavert@gmail.com",
- "homepage": "http://www.josesalavert.com"
- }
- ],
- "description": "Time ago Twig extension where you can easily convert a datetime or timestamp to a distance of time in words.",
- "homepage": "http://github.com/salavert/time-ago-in-words",
- "keywords": [
- "distance of time",
- "time",
- "time ago",
- "time ago in words",
- "twig"
- ],
- "time": "2015-06-30 17:31:54"
- },
- {
- "name": "sensio/distribution-bundle",
- "version": "v3.0.35",
- "target-dir": "Sensio/Bundle/DistributionBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "abc5b0ce28f72f838922aa0e0a107ba270dbabb5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/abc5b0ce28f72f838922aa0e0a107ba270dbabb5",
- "reference": "abc5b0ce28f72f838922aa0e0a107ba270dbabb5",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "sensiolabs/security-checker": "~3.0",
- "symfony/class-loader": "~2.2",
- "symfony/framework-bundle": "~2.3",
- "symfony/process": "~2.2"
- },
- "require-dev": {
- "symfony/form": "~2.2",
- "symfony/validator": "~2.2",
- "symfony/yaml": "~2.2"
- },
- "suggest": {
- "symfony/form": "If you want to use the configurator",
- "symfony/validator": "If you want to use the configurator",
- "symfony/yaml": "If you want to use the configurator"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Sensio\\Bundle\\DistributionBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Base bundle for Symfony Distributions",
- "keywords": [
- "configuration",
- "distribution"
- ],
- "time": "2015-12-08 17:53:19"
- },
- {
- "name": "sensio/framework-extra-bundle",
- "version": "v3.0.14",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "cccf975c565ccd835bddc30a8fea5cdfe3357bf1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/cccf975c565ccd835bddc30a8fea5cdfe3357bf1",
- "reference": "cccf975c565ccd835bddc30a8fea5cdfe3357bf1",
- "shasum": ""
- },
- "require": {
- "doctrine/common": "~2.2",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0"
- },
- "require-dev": {
- "symfony/browser-kit": "~2.3|~3.0",
- "symfony/dom-crawler": "~2.3|~3.0",
- "symfony/expression-language": "~2.4|~3.0",
- "symfony/finder": "~2.3|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/security-bundle": "~2.4|~3.0",
- "symfony/twig-bundle": "~2.3|~3.0",
- "twig/twig": "~1.11|~2.0"
- },
- "suggest": {
- "symfony/expression-language": "",
- "symfony/psr-http-message-bridge": "To use the PSR-7 converters",
- "symfony/security-bundle": ""
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Sensio\\Bundle\\FrameworkExtraBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "This bundle provides a way to configure your controllers with annotations",
- "keywords": [
- "annotations",
- "controllers"
- ],
- "time": "2016-03-01 10:50:07"
- },
- {
- "name": "sensiolabs/security-checker",
- "version": "v3.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/security-checker.git",
- "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93",
- "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93",
- "shasum": ""
- },
- "require": {
- "symfony/console": "~2.0|~3.0"
- },
- "bin": [
- "security-checker"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "SensioLabs\\Security": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien.potencier@gmail.com"
- }
- ],
- "description": "A security checker for your composer.lock",
- "time": "2015-11-07 08:07:40"
- },
- {
- "name": "swiftmailer/swiftmailer",
- "version": "v5.4.1",
- "source": {
- "type": "git",
- "url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
- "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "mockery/mockery": "~0.9.1,<0.9.4"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.4-dev"
- }
- },
- "autoload": {
- "files": [
- "lib/swift_required.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Chris Corbyn"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Swiftmailer, free feature-rich PHP mailer",
- "homepage": "http://swiftmailer.org",
- "keywords": [
- "email",
- "mail",
- "mailer"
- ],
- "time": "2015-06-06 14:19:39"
- },
- {
- "name": "symfony/assetic-bundle",
- "version": "v2.8.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/assetic-bundle.git",
- "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/aa5b4f8b712f38745928fa845ddb73300bb2af6d",
- "reference": "aa5b4f8b712f38745928fa845ddb73300bb2af6d",
- "shasum": ""
- },
- "require": {
- "kriswallsmith/assetic": "~1.3",
- "php": ">=5.3.0",
- "symfony/console": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/framework-bundle": "~2.3|~3.0",
- "symfony/yaml": "~2.3|~3.0"
- },
- "conflict": {
- "kriswallsmith/spork": "<=0.2",
- "twig/twig": "<1.20"
- },
- "require-dev": {
- "kriswallsmith/spork": "~0.3",
- "patchwork/jsqueeze": "~1.0",
- "symfony/class-loader": "~2.3|~3.0",
- "symfony/css-selector": "~2.3|~3.0",
- "symfony/dom-crawler": "~2.3|~3.0",
- "symfony/phpunit-bridge": "~2.7|~3.0",
- "symfony/twig-bundle": "~2.3|~3.0"
- },
- "suggest": {
- "kriswallsmith/spork": "to be able to dump assets in parallel",
- "symfony/twig-bundle": "to use the Twig integration"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Bundle\\AsseticBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Kris Wallsmith",
- "email": "kris.wallsmith@gmail.com",
- "homepage": "http://kriswallsmith.net/"
- }
- ],
- "description": "Integrates Assetic into Symfony2",
- "homepage": "https://github.com/symfony/AsseticBundle",
- "keywords": [
- "assets",
- "compression",
- "minification"
- ],
- "time": "2015-12-28 13:12:39"
- },
- {
- "name": "symfony/monolog-bundle",
- "version": "v2.10.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/monolog-bundle.git",
- "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/82fd8f36e2cccbe94faf237403c48052d4d4b77e",
- "reference": "82fd8f36e2cccbe94faf237403c48052d4d4b77e",
- "shasum": ""
- },
- "require": {
- "monolog/monolog": "~1.12",
- "php": ">=5.3.2",
- "symfony/config": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/http-kernel": "~2.3|~3.0",
- "symfony/monolog-bridge": "~2.3|~3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8",
- "symfony/console": "~2.3|~3.0",
- "symfony/yaml": "~2.3|~3.0"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.9.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Bundle\\MonologBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony MonologBundle",
- "homepage": "http://symfony.com",
- "keywords": [
- "log",
- "logging"
- ],
- "time": "2016-03-13 15:55:56"
- },
- {
- "name": "symfony/polyfill-apcu",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-apcu.git",
- "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c",
- "reference": "d1911e6caeb4b6a4c8e2d5c46b978a66b3745e4c",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "apcu",
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-intl-icu",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-intl-icu.git",
- "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66b0bb4abda229bc073eff6bbc8f2685bdaac165",
- "reference": "66b0bb4abda229bc073eff6bbc8f2685bdaac165",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "symfony/intl": "~2.3|~3.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for intl's ICU-related data and classes",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "icu",
- "intl",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-mbstring",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "1289d16209491b584839022f29257ad859b8532d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
- "reference": "1289d16209491b584839022f29257ad859b8532d",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "suggest": {
- "ext-mbstring": "For best performance"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for the Mbstring extension",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "mbstring",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-php54",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php54.git",
- "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054",
- "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php54\\": ""
- },
- "files": [
- "bootstrap.php"
- ],
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-php55",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php55.git",
- "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6",
- "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6",
- "shasum": ""
- },
- "require": {
- "ircmaxell/password-compat": "~1.0",
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php55\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-php56",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "4d891fff050101a53a4caabb03277284942d1ad9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9",
- "reference": "4d891fff050101a53a4caabb03277284942d1ad9",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "symfony/polyfill-util": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php56\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/polyfill-php70",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/8428ceddbbaf102f2906769a8ef2438220c5cb95",
- "reference": "8428ceddbbaf102f2906769a8ef2438220c5cb95",
- "shasum": ""
- },
- "require": {
- "paragonie/random_compat": "~1.0",
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php70\\": ""
- },
- "files": [
- "bootstrap.php"
- ],
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-01-25 08:44:42"
- },
- {
- "name": "symfony/polyfill-util",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-util.git",
- "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
- "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Util\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony utilities for portability of PHP codes",
- "homepage": "https://symfony.com",
- "keywords": [
- "compat",
- "compatibility",
- "polyfill",
- "shim"
- ],
- "time": "2016-01-20 09:13:37"
- },
- {
- "name": "symfony/security-acl",
- "version": "v2.8.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/security-acl.git",
- "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/security-acl/zipball/4a3f7327ad215242c78f6564ad4ea6d2db1b8347",
- "reference": "4a3f7327ad215242c78f6564ad4ea6d2db1b8347",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.9",
- "symfony/security-core": "~2.4|~3.0.0"
- },
- "require-dev": {
- "doctrine/common": "~2.2",
- "doctrine/dbal": "~2.2",
- "psr/log": "~1.0",
- "symfony/phpunit-bridge": "~2.7|~3.0.0"
- },
- "suggest": {
- "doctrine/dbal": "For using the built-in ACL implementation",
- "symfony/class-loader": "For using the ACL generateSql script",
- "symfony/finder": "For using the ACL generateSql script"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.8-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Security\\Acl\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Security Component - ACL (Access Control List)",
- "homepage": "https://symfony.com",
- "time": "2015-12-28 09:39:09"
- },
- {
- "name": "symfony/swiftmailer-bundle",
- "version": "v2.3.11",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/swiftmailer-bundle.git",
- "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/5e1a90f28213231ceee19c953bbebc5b5b95c690",
- "reference": "5e1a90f28213231ceee19c953bbebc5b5b95c690",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2",
- "swiftmailer/swiftmailer": ">=4.2.0,~5.0",
- "symfony/config": "~2.3|~3.0",
- "symfony/dependency-injection": "~2.3|~3.0",
- "symfony/http-kernel": "~2.3|~3.0",
- "symfony/yaml": "~2.3|~3.0"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7|~3.0"
- },
- "suggest": {
- "psr/log": "Allows logging"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Bundle\\SwiftmailerBundle\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony SwiftmailerBundle",
- "homepage": "http://symfony.com",
- "time": "2016-01-15 16:41:20"
- },
- {
- "name": "symfony/symfony",
- "version": "v2.8.3",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/symfony.git",
- "reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/7a9a5fce7ce6e448e527f635463dda00761e12c2",
- "reference": "7a9a5fce7ce6e448e527f635463dda00761e12c2",
- "shasum": ""
- },
- "require": {
- "doctrine/common": "~2.4",
- "php": ">=5.3.9",
- "psr/log": "~1.0",
- "symfony/polyfill-apcu": "~1.1",
- "symfony/polyfill-intl-icu": "~1.0",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php54": "~1.0",
- "symfony/polyfill-php55": "~1.0",
- "symfony/polyfill-php56": "~1.0",
- "symfony/polyfill-php70": "~1.0",
- "symfony/polyfill-util": "~1.0",
- "symfony/security-acl": "~2.7",
- "twig/twig": "~1.23|~2.0"
- },
- "conflict": {
- "phpdocumentor/reflection": "<1.0.7"
- },
- "replace": {
- "symfony/asset": "self.version",
- "symfony/browser-kit": "self.version",
- "symfony/class-loader": "self.version",
- "symfony/config": "self.version",
- "symfony/console": "self.version",
- "symfony/css-selector": "self.version",
- "symfony/debug": "self.version",
- "symfony/debug-bundle": "self.version",
- "symfony/dependency-injection": "self.version",
- "symfony/doctrine-bridge": "self.version",
- "symfony/dom-crawler": "self.version",
- "symfony/event-dispatcher": "self.version",
- "symfony/expression-language": "self.version",
- "symfony/filesystem": "self.version",
- "symfony/finder": "self.version",
- "symfony/form": "self.version",
- "symfony/framework-bundle": "self.version",
- "symfony/http-foundation": "self.version",
- "symfony/http-kernel": "self.version",
- "symfony/intl": "self.version",
- "symfony/ldap": "self.version",
- "symfony/locale": "self.version",
- "symfony/monolog-bridge": "self.version",
- "symfony/options-resolver": "self.version",
- "symfony/process": "self.version",
- "symfony/property-access": "self.version",
- "symfony/property-info": "self.version",
- "symfony/proxy-manager-bridge": "self.version",
- "symfony/routing": "self.version",
- "symfony/security": "self.version",
- "symfony/security-bundle": "self.version",
- "symfony/security-core": "self.version",
- "symfony/security-csrf": "self.version",
- "symfony/security-guard": "self.version",
- "symfony/security-http": "self.version",
- "symfony/serializer": "self.version",
- "symfony/stopwatch": "self.version",
- "symfony/swiftmailer-bridge": "self.version",
- "symfony/templating": "self.version",
- "symfony/translation": "self.version",
- "symfony/twig-bridge": "self.version",
- "symfony/twig-bundle": "self.version",
- "symfony/validator": "self.version",
- "symfony/var-dumper": "self.version",
- "symfony/web-profiler-bundle": "self.version",
- "symfony/yaml": "self.version"
- },
- "require-dev": {
- "doctrine/data-fixtures": "1.0.*",
- "doctrine/dbal": "~2.4",
- "doctrine/doctrine-bundle": "~1.2",
- "doctrine/orm": "~2.4,>=2.4.5",
- "egulias/email-validator": "~1.2",
- "monolog/monolog": "~1.11",
- "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
- "phpdocumentor/reflection": "^1.0.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.8-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
- "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
- "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
- "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
- "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
- "Symfony\\Bundle\\": "src/Symfony/Bundle/",
- "Symfony\\Component\\": "src/Symfony/Component/"
- },
- "classmap": [
- "src/Symfony/Component/Intl/Resources/stubs"
- ],
- "exclude-from-classmap": [
- "**/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "The Symfony PHP framework",
- "homepage": "https://symfony.com",
- "keywords": [
- "framework"
- ],
- "time": "2016-02-28 21:06:29"
- },
- {
- "name": "twig/extensions",
- "version": "v1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/twigphp/Twig-extensions.git",
- "reference": "449e3c8a9ffad7c2479c7864557275a32b037499"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499",
- "reference": "449e3c8a9ffad7c2479c7864557275a32b037499",
- "shasum": ""
- },
- "require": {
- "twig/twig": "~1.20|~2.0"
- },
- "require-dev": {
- "symfony/translation": "~2.3"
- },
- "suggest": {
- "symfony/translation": "Allow the time_diff output to be translated"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Twig_Extensions_": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Common additional features for Twig that do not directly belong in core",
- "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
- "keywords": [
- "i18n",
- "text"
- ],
- "time": "2015-08-22 16:38:35"
- },
- {
- "name": "twig/twig",
- "version": "v1.24.0",
- "source": {
- "type": "git",
- "url": "https://github.com/twigphp/Twig.git",
- "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
- "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.7"
- },
- "require-dev": {
- "symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~2.7"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.24-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Twig_": "lib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
- {
- "name": "Armin Ronacher",
- "email": "armin.ronacher@active-4.com",
- "role": "Project Founder"
- },
- {
- "name": "Twig Team",
- "homepage": "http://twig.sensiolabs.org/contributors",
- "role": "Contributors"
- }
- ],
- "description": "Twig, the flexible, fast, and secure template language for PHP",
- "homepage": "http://twig.sensiolabs.org",
- "keywords": [
- "templating"
- ],
- "time": "2016-01-25 21:22:18"
- }
- ],
- "packages-dev": [
- {
- "name": "sensio/generator-bundle",
- "version": "v2.5.3",
- "target-dir": "Sensio/Bundle/GeneratorBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "e50108c2133ee5c9c484555faed50c17a61221d3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3",
- "reference": "e50108c2133ee5c9c484555faed50c17a61221d3",
- "shasum": ""
- },
- "require": {
- "symfony/console": "~2.5",
- "symfony/framework-bundle": "~2.2"
- },
- "require-dev": {
- "doctrine/orm": "~2.2,>=2.2.3",
- "symfony/doctrine-bridge": "~2.2",
- "twig/twig": "~1.11"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "2.5.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Sensio\\Bundle\\GeneratorBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "This bundle generates code for you",
- "time": "2015-03-17 06:36:52"
- },
- {
- "name": "vmelnik/doctrine-encrypt-bundle",
- "version": "2.0.1",
- "target-dir": "VMelnik/DoctrineEncryptBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/vmelnik-ukraine/DoctrineEncryptBundle.git",
- "reference": "eedfd91ecdd46fd4c8db040e3704af31832ee39c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/vmelnik-ukraine/DoctrineEncryptBundle/zipball/eedfd91ecdd46fd4c8db040e3704af31832ee39c",
- "reference": "eedfd91ecdd46fd4c8db040e3704af31832ee39c",
- "shasum": ""
- },
- "require": {
- "ext-mcrypt": "*",
- "php": ">=5.3.2",
- "symfony/framework-bundle": ">=2.0"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "VMelnik\\DoctrineEncryptBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Victor Melnik",
- "email": "melnikvictorl@gmail.com"
- }
- ],
- "description": "Symfony 2 bundle which allows to encrypt data in database with some encrypt algorithm",
- "keywords": [
- "aes256",
- "decrypt",
- "doctrine",
- "encrypt"
- ],
- "time": "2013-01-05 22:57:52"
- }
- ],
- "aliases": [],
- "minimum-stability": "stable",
- "stability-flags": {
- "friendsofsymfony/user-bundle": 20,
- "lrotherfield/form": 20
- },
- "prefer-stable": false,
- "prefer-lowest": false,
- "platform": {
- "php": ">=5.3.3"
- },
- "platform-dev": []
-}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0541559
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "3"
+services:
+ web:
+ build:
+ context: docker/nginx/dev
+ ports:
+ - "8082:80"
+ volumes:
+ - ./app/web:/var/www/app/web
+ php:
+ build:
+ context: .
+ dockerfile: docker/php/dev/Dockerfile.php.dev
+ volumes:
+ - ./app:/var/www/app:rw,cached
+ environment:
+ - APP_ENV=prod
+ - APP_SECRET=35b8c671e74bfc34aedbd178cc1faf51
+ mysql:
+ image: mariadb:10.3
+ environment:
+ - MYSQL_USER=vcs
+ - MYSQL_PASSWORD=vcs
+ - MYSQL_ROOT_PASSWORD=root
+ - MYSQL_DATABASE=versioncontrol
+ volumes:
+ - db-data:/var/lib/mysql:rw
+ restart: always
+ ports:
+ - "3308:3306"
+ expose:
+ - 3308
+
+ sshtest:
+ build:
+ context: .
+ dockerfile: docker/ssh-test/Dockerfile
+volumes:
+ db-data: {}
diff --git a/docker/nginx/dev/Dockerfile b/docker/nginx/dev/Dockerfile
new file mode 100644
index 0000000..a8c5f0b
--- /dev/null
+++ b/docker/nginx/dev/Dockerfile
@@ -0,0 +1,11 @@
+FROM nginx:1.13.7
+
+COPY ./default.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+
+ENV NGINX_HOST localhost
+ENV NGINX_PORT 80
+
+RUN envsubst '$$NGINX_HOST $$NGINX_PORT' < /etc/nginx/conf.d/default.conf > /etc/nginx/conf.d/default.conf
+
diff --git a/docker/nginx/dev/default.conf b/docker/nginx/dev/default.conf
new file mode 100644
index 0000000..4210c61
--- /dev/null
+++ b/docker/nginx/dev/default.conf
@@ -0,0 +1,42 @@
+server {
+ listen $NGINX_PORT;
+ server_name $NGINX_HOST;
+
+ root /var/www/app/web;
+
+ location / {
+ if ($request_method = 'OPTIONS') {
+ add_header 'Access-Control-Allow-Origin' '*';
+ add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+ add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,X-AUTH-TOKEN,X-Accept-Version,X-CCT-AUTH';
+ add_header 'Access-Control-Max-Age' 1728000;
+ add_header 'Content-Type' 'text/plain; charset=utf-8';
+ add_header 'Content-Length' 0;
+ return 204;
+ }
+ add_header Access-Control-Allow-Origin *;
+ try_files $uri /index.php$is_args$args;
+ }
+
+ location ~ ^/(index)\.php(/|$) {
+ if ($request_method = 'OPTIONS') {
+ add_header 'Access-Control-Allow-Origin' '*';
+ add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+ add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,X-AUTH-TOKEN,X-Accept-Version,X-CCT-AUTH';
+ add_header 'Access-Control-Max-Age' 1728000;
+ add_header 'Content-Type' 'text/plain; charset=utf-8';
+ add_header 'Content-Length' 0;
+ return 204;
+ }
+ add_header Access-Control-Allow-Origin *;
+
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass php:9000;
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ }
+
+ error_log /var/log/nginx/error.log;
+ access_log /var/log/nginx/access.log;
+}
diff --git a/docker/nginx/prod/default.conf b/docker/nginx/prod/default.conf
new file mode 100644
index 0000000..f2b97c7
--- /dev/null
+++ b/docker/nginx/prod/default.conf
@@ -0,0 +1,46 @@
+server {
+ listen $NGINX_PORT;
+ listen [::]:80 default ipv6only=on; ## listen for ipv6
+
+ root /app/public;
+ index index.php index.html index.htm;
+
+ # Make site accessible from http://localhost/
+ server_name _;
+
+ location / {
+ if ($request_method = 'OPTIONS') {
+ add_header 'Access-Control-Allow-Origin' '*' always;
+ add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+ add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,X-AUTH-TOKEN,X-Accept-Version,X-CCT-AUTH';
+ add_header 'Access-Control-Max-Age' 1728000;
+ add_header 'Content-Type' 'text/plain; charset=utf-8';
+ add_header 'Content-Length' 0;
+ return 204;
+ }
+ add_header Access-Control-Allow-Origin * always;
+ try_files $uri /index.php$is_args$args;
+ }
+
+ location ~ \.php$ {
+ if ($request_method = 'OPTIONS') {
+ add_header 'Access-Control-Allow-Origin' '*' always;
+ add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+ add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,X-AUTH-TOKEN,X-Accept-Version,X-CCT-AUTH';
+ add_header 'Access-Control-Max-Age' 1728000;
+ add_header 'Content-Type' 'text/plain; charset=utf-8';
+ add_header 'Content-Length' 0;
+ return 204;
+ }
+ add_header Access-Control-Allow-Origin * always;
+
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass php:9000;
+ include fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ }
+
+ error_log /var/log/nginx/error.log;
+ access_log /var/log/nginx/access.log;
+}
diff --git a/docker/php/dev/Dockerfile.php.dev b/docker/php/dev/Dockerfile.php.dev
new file mode 100644
index 0000000..5f0bb87
--- /dev/null
+++ b/docker/php/dev/Dockerfile.php.dev
@@ -0,0 +1,39 @@
+FROM composer:1.8
+FROM php:7.2-fpm-alpine
+
+COPY ./docker/php/dev/development.ini /usr/local/etc/php/conf.d/development.ini
+
+WORKDIR /var/www/app
+
+ENV COMPOSER_ALLOW_SUPERUSER 1
+
+RUN apk upgrade -q -U -a \
+ && apk add --no-cache \
+ git \
+ icu-libs \
+ openssh \
+ libssh2 \
+ libssh2-dev
+
+RUN set -xe \
+ && apk add --no-cache --virtual .build-deps \
+ $PHPIZE_DEPS \
+ icu-dev \
+ freetype-dev \
+ libzip-dev \
+ && pecl install redis-4.1.1 \
+ && pecl install ssh2-1.1.2 \
+ && docker-php-ext-install \
+ mbstring \
+ zip \
+ pdo \
+ pdo_mysql \
+ && pecl install apcu-5.1.17 \
+ && pecl install xdebug-2.7.0RC2 \
+ && docker-php-ext-enable --ini-name 20-apcu.ini apcu \
+ && docker-php-ext-enable --ini-name 05-opcache.ini opcache \
+ && docker-php-ext-enable redis \
+ && docker-php-ext-enable ssh2 \
+ && docker-php-ext-enable xdebug
+
+COPY --from=0 /usr/bin/composer /usr/bin/composer
diff --git a/docker/php/dev/development.ini b/docker/php/dev/development.ini
new file mode 100644
index 0000000..ef89aa2
--- /dev/null
+++ b/docker/php/dev/development.ini
@@ -0,0 +1,39 @@
+; -------------------------------------
+; DEVELOPMENT configuration
+; -------------------------------------
+
+; this file will overwrite default php.ini settings
+
+display_errors = 1
+
+short_open_tag = On
+variables_order = 'GPCS'
+request_order = 'GP'
+
+allow_url_fopen = On
+allow_url_include = Off
+
+memory_limit = 512M
+max_execution_time = 900
+max_input_time = 300
+post_max_size = 50M
+upload_max_filesize = 50M
+max_input_vars = 5000
+always_populate_raw_post_data = -1
+
+expose_php = Off
+
+date.timezone = UTC
+
+; XDebug
+xdebug.remote_enable = 1
+xdebug.remote_connect_back = 0
+xdebug.remote_mode = req
+xdebug.remote_port = 9000
+xdebug.remote_host = 10.254.254.254
+xdebug.idekey = "gitssh2"
+xdebug.cli_color = 1
+xdebug.max_nesting_level = 1000
+xdebug.profiler_enable_trigger = 1
+xdebug.profiler_output_dir = '/app/debug/'
+xhprof.output_dir = '/app/debug/'
diff --git a/docker/php/prod/production.ini b/docker/php/prod/production.ini
new file mode 100644
index 0000000..178c923
--- /dev/null
+++ b/docker/php/prod/production.ini
@@ -0,0 +1,31 @@
+; -------------------------------------
+; PRODUCTION configuration
+; -------------------------------------
+
+; this file will overwrite default php.ini settings
+
+display_errors = 0
+
+short_open_tag = On
+variables_order = 'GPCS'
+request_order = 'GP'
+
+allow_url_fopen = On
+allow_url_include = Off
+
+memory_limit = 512M
+max_execution_time = 900
+max_input_time = 300
+post_max_size = 50M
+upload_max_filesize = 50M
+max_input_vars = 5000
+always_populate_raw_post_data = -1
+
+expose_php = Off
+
+date.timezone = UTC
+
+
+; XDebug
+xdebug.remote_enable = 0
+xdebug.remote_connect_back = off
diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile
new file mode 100644
index 0000000..a0116e7
--- /dev/null
+++ b/docker/redis/Dockerfile
@@ -0,0 +1,12 @@
+#++++++++++++++++++++++++++++++++++++++
+# Redis Docker container
+#++++++++++++++++++++++++++++++++++++++
+#
+# Official images:
+#
+# redis - official Redis
+# https://hub.docker.com/r/library/redis/
+#
+#++++++++++++++++++++++++++++++++++++++
+
+FROM redis
diff --git a/docker/ssh-test/Dockerfile b/docker/ssh-test/Dockerfile
new file mode 100644
index 0000000..cf1488a
--- /dev/null
+++ b/docker/ssh-test/Dockerfile
@@ -0,0 +1,18 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y openssh-server git
+RUN mkdir /var/run/sshd
+RUN echo 'root:root' | chpasswd
+RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+
+# SSH login fix. Otherwise user is kicked off after login
+RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
+
+ENV NOTVISIBLE "in users profile"
+RUN echo "export VISIBLE=now" >> /etc/profile
+
+RUN mkdir /var/www
+RUN cd /var/www/ && git clone https://github.com/SSHVersionControl/git-web-client.git
+
+EXPOSE 22
+CMD ["/usr/sbin/sshd", "-D"]
diff --git a/src/VersionControl/DoctrineEncryptBundle/Encryptors/AES256Encryptor.php b/src/VersionControl/DoctrineEncryptBundle/Encryptors/AES256Encryptor.php
deleted file mode 100644
index e22cc20..0000000
--- a/src/VersionControl/DoctrineEncryptBundle/Encryptors/AES256Encryptor.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
- */
-class AES256Encryptor implements EncryptorInterface {
-
- /**
- * Secret key for aes algorythm
- * @var string
- */
- private $secretKey;
-
- /**
- * Initialization of encryptor
- * @param string $key
- */
- public function __construct($key) {
- $this->secretKey = $key;
- }
-
- /**
- * Implementation of EncryptorInterface encrypt method
- * @param string $data
- * @return string
- */
- public function encrypt($data) {
- return trim(base64_encode(mcrypt_encrypt(
- MCRYPT_RIJNDAEL_256, $this->secretKey, $data, MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND
- ))));
- }
-
- /**
- * Implementation of EncryptorInterface decrypt method
- * @param string $data
- * @return string
- */
- function decrypt($data) {
- return trim(mcrypt_decrypt(
- MCRYPT_RIJNDAEL_256, $this->secretKey, base64_decode($data), MCRYPT_MODE_ECB, mcrypt_create_iv(
- mcrypt_get_iv_size(
- MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB
- ), MCRYPT_RAND
- )));
- }
-
-}
\ No newline at end of file
diff --git a/src/VersionControl/GitCommandBundle/Entity/GitDiff.php b/src/VersionControl/GitCommandBundle/Entity/GitDiff.php
deleted file mode 100644
index 21908b9..0000000
--- a/src/VersionControl/GitCommandBundle/Entity/GitDiff.php
+++ /dev/null
@@ -1,139 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Entity;
-
-
-/**
- * Git Diff Entity.
- *
- * @author Paul Schweppe
- */
-class GitDiff {
-
- const NEWFILE = 'new';
-
- const DELETDFILE = 'deleted';
-
- const MODIFIEDFILE = 'modified';
-
- /**
- * File before commit eg From File
- * @var string
- */
- protected $fileA;
-
- /**
- * File after commit eg To file
- * @var string
- */
- protected $fileB;
-
- /**
- * Lines in Commit
- * @var array of GitDiffLines
- */
- protected $diffLines;
-
- public function __construct() {
-
- }
-
- /**
- * Get file from path
- * @return string
- */
- public function getFileA() {
- return $this->fileA;
- }
-
- /**
- * Set file to
- * @param type $fileA
- * @return \VersionControl\GitCommandBundle\Entity\GitDiff
- */
- public function setFileA($fileA) {
- $this->fileA = $fileA;
- return $this;
- }
-
- /**
- * Get file to path
- * @return string
- */
- public function getFileB() {
- return $this->fileB;
- }
-
- /**
- * Set file From
- * @param type $fileB
- * @return \VersionControl\GitCommandBundle\Entity\GitDiff
- */
- public function setFileB($fileB) {
- $this->fileB = $fileB;
- return $this;
- }
-
- /**
- * Gets array of Git Diff lines
- * @return array Of GitDiffLines
- */
- public function getDiffLines() {
- return $this->diffLines;
- }
-
- /**
- * Sets git diff lines
- * @param array $diffLines
- * @return \VersionControl\GitCommandBundle\Entity\GitDiff
- */
- public function setDiffLines($diffLines) {
- $this->diffLines = $diffLines;
- return $this;
- }
-
- /**
- * Gets the diff file name based on file a and b
- * Removes a/ or b/ from start of file path
- * @return string files path
- */
- public function getFileName(){
- if($this->fileA == '/dev/null'){
- $file = $this->fileB;
- }else{
- $file = $this->fileA;
- }
-
- return substr($file ,2);
- }
-
- /**
- * Gets the status of the diff eg new, deleted or modified
- * @return string constant
- */
- public function getStatus(){
- if($this->fileA == '/dev/null'){
- $status = self::NEWFILE;
- }elseif($this->fileB == '/dev/null'){
- $status = self::DELETDFILE;
- }else{
- $status = self::MODIFIEDFILE;
- }
-
- return $status;
- }
-
-
-
-
-
-}
diff --git a/src/VersionControl/GitCommandBundle/Entity/GitDiffLine.php b/src/VersionControl/GitCommandBundle/Entity/GitDiffLine.php
deleted file mode 100644
index 4986ff2..0000000
--- a/src/VersionControl/GitCommandBundle/Entity/GitDiffLine.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Entity;
-
-
-/**
- * Git Diff Line:
- *
- * @author Paul Schweppe
- */
-class GitDiffLine {
-
- const NOCHANGE = 0;
-
- const ADDED = 1;
-
- const REMOVED = 2;
-
- /**
- * @var int
- */
- protected $type;
-
- /**
- * The line content
- * @var string
- */
- protected $line;
-
- /**
- * The line number. Can be a number or string eg '...'
- * @var string
- */
- protected $lineNumber;
-
- /**
- * Sets line and line type
- * @param String $line The line content
- */
- public function __construct($line){
- $this->line = $line;
-
- $firstCharacter = substr($line,0,1);
-
- if ($firstCharacter !== false) {
- if ($firstCharacter == '+') {
- $this->type = self::ADDED;
- // $type = Line::ADDED;
- } elseif ($firstCharacter == '-') {
- $this->type = self::REMOVED;
- }else{
- $this->type = self::NOCHANGE;
- }
- }else{
- $this->type = self::NOCHANGE;
- }
- }
-
- /**
- * Get Line type
- * @return integer
- */
- public function getType() {
- return $this->type;
- }
-
- /**
- * Sets line type
- * @param integer $type
- * @return \VersionControl\GitCommandBundle\Entity\GitDiffLine
- */
- public function setType($type) {
- $this->type = $type;
- return $this;
- }
-
- /**
- * Gets line content
- * @return string
- */
- public function getLine() {
- return $this->line;
- }
-
-
- /**
- * Gets line number. This can be a string
- * @return string
- */
- public function getLineNumber() {
- return $this->lineNumber;
- }
-
- /**
- * Sets line content
- * @param string $lineNumber
- * @return \VersionControl\GitCommandBundle\Entity\GitDiffLine
- */
- public function setLineNumber($lineNumber) {
- $this->lineNumber = $lineNumber;
- return $this;
- }
-
-
-
-
-
-}
diff --git a/src/VersionControl/GitCommandBundle/Entity/GitFile.php b/src/VersionControl/GitCommandBundle/Entity/GitFile.php
deleted file mode 100644
index 276bf4d..0000000
--- a/src/VersionControl/GitCommandBundle/Entity/GitFile.php
+++ /dev/null
@@ -1,145 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Entity;
-
-
-
-/**
- * In the short-format, the status of each path is shown as
- * XY PATH1 -> PATH2
- * where PATH1 is the path in the HEAD, and the ` -> PATH2` part is shown only when PATH1 corresponds to a different path in the index/worktree (i.e. the file is renamed). The XY is a two-letter status code.
- *
- * The fields (including the ->) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped.
- * For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For untracked paths, XY are ??. Other status codes can be interpreted as follows:
- * ' ' = unmodified
- * M = modified
- * A = added
- * D = deleted
- * R = renamed
- * C = copied
- * U = updated but unmerged
-
-Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.
-
-X Y Meaning
--------------------------------------------------
- [MD] not updated
-M [ MD] updated in index
-A [ MD] added to index
-D [ M] deleted from index
-R [ MD] renamed in index
-C [ MD] copied in index
-[MARC] index and work tree matches
-[ MARC] M work tree changed since index
-[ MARC] D deleted in work tree
--------------------------------------------------
-D D unmerged, both deleted
-A U unmerged, added by us
-U D unmerged, deleted by them
-U A unmerged, added by them
-D U unmerged, deleted by us
-A A unmerged, both added
-U U unmerged, both modified
--------------------------------------------------
-? ? untracked
-! ! ignored
--------------------------------------------------
-If -b is used the short-format status is preceded by a line
-
- * @author Paul Schweppe
- */
-class GitFile
-{
- /**
- */
- protected $id;
-
- protected $fileType;
-
- protected $indexStatus;
-
- protected $workTreeStatus;
-
- protected $path1;
-
- protected $path2;
-
- protected $line;
-
- protected $gitPath;
-
-
- public function __construct($line,$gitPath){
- $this->line = $line;
- $this->gitPath = $gitPath;
-
- $path = substr(rtrim($line), 3);
- $paths = explode (' -> ', $path);
- if(count($paths) == 2){
- $this->path1 = $paths[0];
- $this->path2 = $paths[1];
- }else{
- $this->path1 = $paths[0];
- }
-
- //$this->fileType = filetype($gitPath.'/'.$this->path1);
-
- $this->indexStatus = $line[0];
- $this->workTreeStatus = $line[1];
-
- }
-
- public function getFileType() {
- return $this->fileType;
- }
-
- public function getIndexStatus() {
- return $this->indexStatus;
- }
-
- public function getWorkTreeStatus() {
- return $this->workTreeStatus;
- }
-
- public function getPath1() {
- return $this->path1;
- }
-
- public function getPath2() {
- return $this->path2;
- }
-
- public function setFileType($fileType) {
- $this->fileType = $fileType;
- }
-
- public function setIndexStatus($indexStatus) {
- $this->indexStatus = $indexStatus;
- }
-
- public function setWorkTreeStatus($workTreeStatus) {
- $this->workTreeStatus = $workTreeStatus;
- }
-
- public function setPath1($path1) {
- $this->path1 = $path1;
- }
-
- public function setPath2($path2) {
- $this->path2 = $path2;
- }
-
-
-
-
-}
-
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/AbstractGitCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/AbstractGitCommand.php
deleted file mode 100644
index 272be98..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/AbstractGitCommand.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-use VersionControl\GitCommandBundle\GitCommands\GitCommand;
-
-use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
-use VersionControl\GitCommandBundle\Event\GitAlterFilesEvent;
-
-/**
- * Abstract Class for Git commands
- *
- * @author Paul Schweppe
- */
-class AbstractGitCommand implements InterfaceGitCommand{
-
- protected $command;
-
- public function __construct(GitCommand $command) {
- $this->command = $command;
- }
-
-
- public function runCommand($command){
- return $this->command->runCommand($command);
- }
-
- /**
- * Gets the number of objects in git repo
- * The command returns data in the format:
- * 3251 objects, 15308 kilobytes
- * @return integer The number of objects
- */
- public function getObjectCount(){
- $result = $this->runCommand('git count-objects');
- $splits = explode(',',$result);
- //0 = object count 1 = size
- $objects = explode(' ',$splits[0]);
- $objectCount = $objects[0];
-
- return $objectCount;
- }
-
- /**
- * Splits a block of text on newlines and returns an array
- *
- * @param string $text Text to split
- * @param boolean $trimSpaces If true then each line is trimmed of white spaces. Default true.
- * @return array Array of lines
- */
- public function splitOnNewLine($text,$trimSpaces = true){
- if(!trim($text)){
- return array();
- }
- $lines = preg_split('/$\R?^/m', $text);
- if($trimSpaces){
- return array_map(array($this,'trimSpaces'),$lines);
- }else{
- return $lines;
- }
- }
-
-
- public function trimSpaces($value){
- return trim(trim($value),'\'');
- }
-
- public function addListener($eventName, $listener)
- {
- $this->command->getEventDispatcher()->addListener($eventName, $listener);
- }
-
- protected function triggerGitAlterFilesEvent($eventName = 'git.alter_files'){
- $event = new GitAlterFilesEvent($this->command->getGitEnvironment(),array());
- $this->triggerEvent($eventName, $event);
- }
-
- protected function triggerEvent($eventName,$event){
- $this->command->dispatcher->dispatch($eventName, $event);
- }
-
- /**
- * Allows you to override the git Environment
- * @param GitEnvironmentInterface $gitEnvironment
- * @return \VersionControl\GitCommandBundle\GitCommands\GitCommand
- */
- public function overRideGitEnvironment(GitEnvironmentInterface $gitEnvironment){
- $this->command->setGitEnvironment($gitEnvironment);
- return $this;
- }
-}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php
deleted file mode 100644
index 6793974..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php
+++ /dev/null
@@ -1,346 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-use VersionControl\GitCommandBundle\GitCommands\GitCommand;
-use VersionControl\GitCommandBundle\GitCommands\Exception\DeleteBranchException;
-use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
-use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidBranchNameException;
-/**
- *
- * @author Paul Schweppe
- */
-class GitBranchCommand extends AbstractGitCommand{
-
- /**
- * Get current active Branch Name
- * If there is no commits (eg new repo) then branch name is 'NEW REPO'
- * This git command needs at least one commit before if show the correct branch name.
- *
- * @return string The current branch name
- */
- public function getCurrentBranch(){
- $branchName = '';
- try{
- //$branchName = $this->runCommand('git rev-parse --abbrev-ref HEAD');
- $branchName = $this->command->runCommand('git symbolic-ref --short -q HEAD');
- }catch(RunGitCommandException $e){
- $branchName = $this->getCurrentBranchOldGit();
- }
- if(!$branchName){
- $branchName = "(No Branch)";
- }
-
- return trim($branchName);
- }
-
- /**
- * Git "--short" does not work on older Git versions.
- * @TODO Check for git version
- * @return string
- * @throws RunGitCommandException
- */
- public function getCurrentBranchOldGit(){
- $branchName = '';
- try{
- //$branchName = $this->runCommand('git rev-parse --abbrev-ref HEAD');
- $response = $this->command->runCommand('git symbolic-ref HEAD');
- $tmp = explode('/', $response);
- $branchName = $tmp['2'];
- }catch(RunGitCommandException $e){
- if($this->getObjectCount() == 0){
- $branchName = 'NEW REPO';
- }else{
- $branchName = "(No Branch)";
- }
- }
-
- return $branchName;
-
-
- }
-
- /**
- * List all of the branches in your repository.
- * To list remote branches you may have to do a git fetch to
- * get lastest changes.
- *
- * @param boolean $local Flag to list local branches only
- * @return type
- */
- public function getBranches($local = false){
-
- $command = 'git for-each-ref "--format=\'%(refname:short)\'"';
- if($local === true){
- $command .= ' '.escapeshellarg("refs/heads/");
- }
-
- $localBranches = $this->command->runCommand($command);
-
- return $this->splitOnNewLine($localBranches,true);
- }
-
- /**
- * List all of the branches in your repository.
- * To list remote branches you may have to do a git fetch to
- * get lastest changes.
- *
- * @param boolean $local Flag to list local branches only
- * @return type
- */
- public function getRemoteBranches(){
-
- $command = 'git for-each-ref "--format=\'%(refname:short)\'"';
-
- $command .= ' '.escapeshellarg("refs/remotes/");
-
-
- $localBranches = $this->command->runCommand($command);
-
- return $this->splitOnNewLine($localBranches,true);
- }
-
- /**
- *
- * @return array
- */
- public function getBranchRemoteListing(){
- $gitBranches = array();
-
- $localBranches = $this->getBranches(true);
-
- $remoteBranches = $this->getRemoteBranches();
-
- foreach ($remoteBranches as $branchName){
- $branchParts = explode('/',$branchName);
- if(in_array($branchParts[1], $localBranches)){
- $gitBranches[] = array('name' => $branchName, 'local' => true);
- }else{
- $gitBranches[] = array('name' => $branchName, 'local' => false);
- }
- }
-
- return $gitBranches;
- }
-
-
-
- /**
- * Creates a new branch. It's important to understand that branches are just pointers to commits.
- * When you create a branch, all Git needs to do is create a new pointer—it doesn’t change the
- * repository in any other way.
- *
- * @param string $branchName Name of new branch
- * @param Boolean $switchToBranch If true the new branch is checked out.
- * @return string command response
- */
- public function createLocalBranch($branchName,$switchToBranch = false){
- if($this->validateBranchName($branchName)){
- $output = $this->command->runCommand(sprintf('git branch %s',escapeshellarg($branchName)));
-
- if($switchToBranch){
- $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
- }
- }else{
- throw new InvalidBranchNameException('This is not a valid branch name');
-
- }
-
- return $output;
- }
-
- /**
- * Creates a new branch from a remote branch. It's important to understand that branches are just pointers to commits.
- * When you create a branch, all Git needs to do is create a new pointer—it doesn’t change the
- * repository in any other way.
- *
- * @param string $branchName Name of new branch
- * @param Boolean $switchToBranch If true the new branch is checked out.
- * @return string command response
- */
- public function createBranchFromRemote($branchName,$remoteBranchName, $switchToBranch = false){
- if($this->validateBranchName($branchName)){
- $output = $this->command->runCommand(sprintf('git branch %s %s 2>&1',escapeshellarg($branchName), escapeshellarg($remoteBranchName)));
-
- if($switchToBranch){
- $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));;
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
- }
- }else{
- throw new InvalidBranchNameException('This is not a valid branch name');
-
- }
-
- return $output;
- }
-
-
-
- /**
- * Validates Branch name. Checks if a branch name is allowed
- *
- * @param string $branchName Name of new branch
- * @return Boolean true if valid branch name
- */
- public function validateBranchName($branchName){
- if (strncasecmp(PHP_OS, 'WIN', 3) == 0) {
- return true;
- } else {
- //$output = $this->command->runCommand(sprintf('(git check-ref-format "refs/heads/%s");echo -e "\n$?"',$branchName));
- $response = $this->command->runCommand(sprintf('git check-ref-format "refs/heads/%s"',$branchName),false);
-
- if($this->command->getLastExitStatus() !== 0){
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Rename the current branch
- *
- * @param string $branchName
- * @return string command output
- * @throws InvalidBranchNameException
- */
- public function renameCurrentBranch($branchName){
- $output = '';
- if($this->validateBranchName($branchName)){
- $output = $this->command->runCommand(sprintf('git branch -m "%s"',$branchName));
- }else{
- throw new InvalidBranchNameException('This is not a valid branch name');
-
- }
-
- return $output;
- }
-
- /**
- * The git checkout command lets you navigate between the branches created by git branch.
- * Checking out a branch updates the files in the working directory to match the version
- * stored in that branch, and it tells Git to record all new commits on that branch.
- *
- * @param string $branchName Name of new branch
- * @param Boolean $switchToBranch If true the new branch is checked out.
- * @return string command response
- */
- public function checkoutBranch($branchName){
-
- $response = $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
- /**
- * Deletes Branch with branch name. Setting $forceDelete equals false is a “safe” operation in that Git prevents you from
- * deleting the branch if it has unmerged changes.
- * Setting $forceDelete equals true force delete the specified branch, even if it has unmerged changes. This is the command to use
- * if you want to permanently throw away all of the commits associated with a particular line of development. Use with caution
- *
- * @param string $branchName Name of branch to delete
- * @param boolean $forceDelete Flag to delete branch, even if it has unmerged changes.
- *
- * @return string command response
- */
- public function deleteBranch($branchName,$forceDelete = false){
- $currentBranch = $this->getCurrentBranch();
- if($branchName === $currentBranch){
- throw new DeleteBranchException('You cannot delete the current branch. Please checkout a different branch before deleting.');
- }
- if($forceDelete === true){
- $deleteFlag = '-D';
- }else{
- $deleteFlag = '-d';
- }
- return $this->command->runCommand(sprintf('git branch '.$deleteFlag.' %s 2>&1', escapeshellarg($branchName)));
- }
-
-
-
- /**
- * Merges current branch with branch of name
- * Merge the specified branch into the current branch, but always generate a merge commit (even if it was a fast-forward merge). This is useful for documenting all merges that occur in your repository.
- *
- * @param string $branchName Name of branch to delete
- * @return string command response
- */
- public function mergeBranch($branchName){
- $currentBranch = $this->getCurrentBranch();
- if($branchName === $currentBranch){
- throw new \Exception('You cannot merge a branch with itself. Please checkout a different branch before trying to merge.');
- }
- $response = $this->command->runCommand(sprintf('git merge --no-ff %s 2>&1', escapeshellarg($branchName)));
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
- /**
- * This attempts to reset your working copy to whatever state it was in before the merge. That means that it should restore any uncommitted changes
- * from before the merge, although it cannot always do so reliably.
- * Generally you shouldn't merge with uncommitted changes anyway.
- *
- * Prior to version 1.7.4:
- *
- * git reset --merge
- * This is older syntax but does the same as the above.
- *
- * Prior to version 1.6.2:
- *
- * git reset --hard
- * which removes all uncommitted changes, including the uncommitted merge. Sometimes this behaviour is useful even in newer versions of Git that support the above commands.
- *
- * @param string $branchName Name of branch to delete
- * @return string command response
- */
- public function abortMerge(){
-
- $response = $this->command->runCommand('git merge --abort 2>&1');
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
- /**
- * List any files
- * @return type
- */
- public function listConflictedFiles(){
-
- return $this->splitOnNewLine($this->command->runCommand('git diff --name-only --diff-filter=U 2>&1'));
- }
-
-
-
- /**
- * Fetch all branches from all remote repositories.
- *
- * @param remote $remote Name of remote Repository
- * @return string command response
- */
- public function fetchAll(){
- return $this->command->runCommand('git fetch --all 2>&1');
- }
-
-}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php
deleted file mode 100644
index 55b2732..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php
+++ /dev/null
@@ -1,229 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-
-use VersionControl\GitCommandBundle\GitCommands\GitDiffParser;
-use VersionControl\GitCommandBundle\Entity\GitFile;
-use VersionControl\GitCommandBundle\Entity\GitLog;
-
-
-/**
- * Description of GitFilesCommand
- *
- * @author Paul Schweppe
- */
-class GitCommitCommand extends AbstractGitCommand{
-
- /**
- * Stage files for commit.
- * In the short-format, the status of each path is shown as
- * XY PATH1 -> PATH2
- * where PATH1 is the path in the HEAD, and the ` -> PATH2` part is shown only when PATH1 corresponds to a different path in the index/worktree (i.e. the file is renamed). The XY is a two-letter status code.
- *
- * The fields (including the ->) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped.
- * For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For untracked paths, XY are ??. Other status codes can be interpreted as follows:
- * ' ' = unmodified
- * M = modified
- * A = added
- * D = deleted
- * R = renamed
- * C = copied
- * U = updated but unmerged
-
- Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.
-
- X Y Meaning
- -------------------------------------------------
- [MD] not updated
- M [ MD] updated in index
- A [ MD] added to index
- D [ M] deleted from index
- R [ MD] renamed in index
- C [ MD] copied in index
- [MARC] index and work tree matches
- [ MARC] M work tree changed since index
- [ MARC] D deleted in work tree
- -------------------------------------------------
- D D unmerged, both deleted
- A U unmerged, added by us
- U D unmerged, deleted by them
- U A unmerged, added by them
- D U unmerged, deleted by us
- A A unmerged, both added
- U U unmerged, both modified
- -------------------------------------------------
- ? ? untracked
- ! ! ignored
- -------------------------------------------------
- If -b is used the short-format status is preceded by a line
- * @TODO: No Support for copy yet
- * @param array $files
- */
- public function stageFiles(array $files){
- $gitFiles = $this->getFilesToCommit();
-
- //Validated that this status is same as previous
- $deleteFiles = array();
- $addFiles = array();
-
- $flippedFiles = array_flip($files);
-
- foreach($gitFiles as $fileEntity){
- if(isset($flippedFiles[$fileEntity->getPath1()])){
- if($fileEntity->getWorkTreeStatus() == '!' || $fileEntity->getWorkTreeStatus() == '!' ){
- //do Nothing ignore
- }elseif(($fileEntity->getIndexStatus() == ' ' || $fileEntity->getIndexStatus() == 'M' || $fileEntity->getIndexStatus() == 'A') && $fileEntity->getWorkTreeStatus() == 'D'){
- //Delete files
- //[ MA] D deleted in work tree
- $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
- }elseif($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'D')){
- //Rename delete
- //[R] D deleted in work tree
- //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
- $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
- }elseif($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'M' || $fileEntity->getWorkTreeStatus() == 'A' || $fileEntity->getWorkTreeStatus() == ' ')){
- //Rename ADD
- //[R] [ M]
- //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
- $addFiles[] = escapeshellarg($fileEntity->getPath2());
- }elseif($fileEntity->getWorkTreeStatus() == ' '){
- //[MARC] index and work tree matches
- //Do Nothing
- }else{
- $addFiles[] = escapeshellarg($fileEntity->getPath1());
- }
- }
- }
-
-
- //Run the commands once for add and delete
- if(count($deleteFiles) > 0){
- $this->command->runCommand('git rm '.implode(' ',$deleteFiles));
- }
-
- if(count($addFiles) > 0){
- $this->command->runCommand('git add '.implode(' ',$addFiles));
- }
-
-
- }
-
- /**
- * Stages the file to be committed.
- * Currently supports adding and removing file.
- *
- * @TODO Make it more effecient
- * @param string $file path to file to commit
- */
- public function stageFile($file){
- $this->stageFiles(array($file));
- }
-
- /**
- * Shortcut to stage all (new, modified, deleted) files
- *
- * @return string Command response
- */
- public function stageAll(){
- return $this->command->runCommand('git add -A');
- }
-
- /**
- * Commits any file that was been staged
- *
- * @param string $message
- * @param string $author name
- * @return string response
- */
- public function commit($message,$author){
-
- return $this->command->runCommand('git commit -m '.escapeshellarg($message).' --author='.escapeshellarg($author));
-
- }
-
- /**
- * Gets all files that need to be commited
- *
- * @return array Array of GitFile objects
- */
- public function getFilesToCommit(){
- $stausData = $this->getStatus();
- $this->statusHash = hash('md5',$stausData);
- $files = $this->processStatus($stausData);
- return $files;
- }
-
- /**
- * Git status command
- * Response:
- * D feedback.html
- * ?? time-selectors/work.html
- *
- * @return string Command Response
- */
- public function getStatus(){
- return $this->command->runCommand('git status -u --porcelain',true,false);
- }
-
- /**
- * Process the git status data into GitFile objects
- *
- * @param string $stausData
- * @return array Array of GitFile objects
- */
- protected function processStatus($stausData){
- $files = array();
-
- $lines = $this->splitOnNewLine($stausData,false);
-
- if(is_array($lines) && count($lines) > 0){
- foreach($lines as $line){
- if(trim($line)){
- $files[] = new GitFile($line,$this->command->getGitPath());
- }
- }
- }
-
- return $files;
- }
-
- /**
- * Get hash of git status
- * @return String hash
- */
- public function getStatusHash() {
- if(!$this->statusHash){
- $stausData = $this->getStatus();
- $this->statusHash = hash('md5',$stausData);
- }
- return $this->statusHash;
- }
-
- /**
- * Counts the number of files not commited
- * @return integer
- */
- public function countStatus(){
- $total = 0;
- $command = 'git status -u -s';
-
- try{
- $response = $this->command->runCommand($command);
- $lines = $this->splitOnNewLine($response,false);
- $total = count($lines);
- }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e){
- //continue
- }
-
- return $total;
- }
-}
\ No newline at end of file
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php
deleted file mode 100644
index 5a02dcc..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php
+++ /dev/null
@@ -1,87 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-use VersionControl\GitCommandBundle\GitCommands\GitDiffParser;
-use VersionControl\GitCommandBundle\Entity\GitCommitFile;
-use VersionControl\GitCommandBundle\Entity\Collections\GitCommitFileCollection;
-
-/**
- * Description of GitFilesCommand
- *
- * @author Paul Schweppe
- */
-class GitDiffCommand extends AbstractGitCommand {
-
-
- /**
- * Get diff based on Commit hash id
- * @return array()
- */
- public function getCommitDiff($commitHash){
- $diffString = $this->command->runCommand("git --no-pager show --oneline ".escapeshellarg($commitHash));
- $diffParser = new GitDiffParser($diffString);
- $diffs = $diffParser->parse();
- return $diffs;
- }
-
- /**
- * Get diff on a file
- * @return array()
- */
- public function getDiffFile($filename){
- $diffString = $this->command->runCommand("git --no-pager diff --oneline ".escapeshellarg($filename)." 2>&1");
- $diffParser = new GitDiffParser($diffString);
- $diffs = $diffParser->parse();
- return $diffs;
- }
-
- /**
- * Get diff on a file between commits
- * @return array()
- */
- public function getDiffFileBetweenCommits($filename,$previousCommitHash,$commitHash){
- $diffString = $this->command->runCommand("git --no-pager diff --oneline ".escapeshellarg($previousCommitHash)." ".escapeshellarg($commitHash)." ".escapeshellarg($filename)." 2>&1");
- $diffParser = new GitDiffParser($diffString);
- $diffs = $diffParser->parse();
- return $diffs;
- }
-
- /**
- * Returns a list of files effected by a commit.
- *
- * @return array() Array of file paths
- */
- public function getFilesInCommit($commitHash){
- $response = $this->command->runCommand("git diff-tree --no-commit-id --name-status -r ".escapeshellarg($commitHash)."");
- $responseLines = $this->splitOnNewLine($response);
- $files = new GitCommitFileCollection();
- foreach($responseLines as $line){
- $files->addGitCommitFile((new GitCommitFile($line)));
- }
- return $files;
- }
-
- public function getPreviousCommitHash($commitHash = 'HEAD'){
- $previousCommitHash = '';
- $response = $this->command->runCommand(" git log --pretty=format:'%h' -n 2 ".escapeshellarg($commitHash)."");
- $responseLines = $this->splitOnNewLine($response);
- if(count($responseLines) == 2){
- $previousCommitHash = trim($responseLines['1']);
- }
-
- return $previousCommitHash;
-
- }
-
-
-
-}
\ No newline at end of file
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php
deleted file mode 100644
index 5d13567..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php
+++ /dev/null
@@ -1,442 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-use VersionControl\GitCommandBundle\Entity\FileInfo;
-use VersionControl\GitCommandBundle\Entity\RemoteFileInfo;
-use VersionControl\GitCommandBundle\Entity\GitFile;
-use VersionControl\GitCommandBundle\Entity\GitLog;
-
-use VersionControl\GitCommandBundle\GitCommands\GitDiffParser;
-use \VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
-
-
-/**
- * Description of GitFilesCommand
- *
- * @author Paul Schweppe
- */
-class GitFilesCommand extends AbstractGitCommand {
-
- /**
- * List files in directory with git log
- * @param string $dir
- * @return array remoteFileInfo/fileInfo
- */
- public function listFiles($dir,$branch="master",$gitFilesOnly=false){
- $files = array();
- $fileList = $this->getFilesInDirectory($dir);
-
- foreach($fileList as $fileInfo){
- $fileLastLog = $this->getLog(1,$branch,$fileInfo->getGitPath());
-
- if(count($fileLastLog) > 0){
- $fileInfo->setGitLog($fileLastLog[0]);
- $files[] = $fileInfo;
- }elseif($gitFilesOnly === false){
- $files[] = $fileInfo;
- }
- }
-
- return $files;
- }
-
- public function getFile($path,$branch="master"){
- $fileInfo = $this->getFileInfo($path);
- $fileLastLog = $this->getLog(1,$branch,$fileInfo->getGitPath());
- if(count($fileLastLog) > 0){
- $fileInfo->setGitLog($fileLastLog[0]);
- }
-
- return $fileInfo;
- }
-
- protected function getFileInfo($path){
-
- $fileInfo = NULL;
-
- if($this->validPathStr($path) === false){
- throw new \Exception('Directory path is not valid. Possible security issue.');
- }
-
- $basePath = $this->addEndingSlash($this->command->getGitEnvironment()->getPath());
-
- if($this->command->getGitEnvironment()->getSsh() === true){
- //Remote Directory Listing
-
- $fileData = $this->command->getSftpProcess()->getFileStats($basePath.$path);
-
- $fileData['filename'] = basename($path);
- $fileData['fullPath'] = $basePath.$path;
- $fileData['gitPath'] = $path;
- $fileInfo = new RemoteFileInfo($fileData);
-
- }else{
-
- $splFileInfo = new \SPLFileInfo($basePath.$path);
- $splFileInfo->setInfoClass('\VersionControl\GitCommandBundle\Entity\FileInfo');
-
- $newFileInfo = $splFileInfo->getFileInfo();
-
- $newFileInfo->setGitPath($basePath.$path);
-
- $fileInfo = $newFileInfo;
-
- }
-
- return $fileInfo;
-
- }
-
- /**
- * Adds Ending slash where needed for unix and windows paths
- *
- * @param string $path
- * @return string
- */
- protected function addEndingSlash($path){
-
- $slash_type = (strpos($path, '\\')===0) ? 'win' : 'unix';
- $last_char = substr($path, strlen($path)-1, 1);
- if ($last_char != '/' and $last_char != '\\') {
- // no slash:
- $path .= ($slash_type == 'win') ? '\\' : '/';
- }
-
- return $path;
- }
-
- /**
- * Sort files by directory then name
- * @param array $fileArray
- */
- protected function sortFilesByDirectoryThenName(array &$fileArray){
- usort($fileArray, function($a, $b){
- if($a->isDir()){
- if($b->isDir()){
- return strnatcasecmp ($a->getFilename(), $b->getFilename());
- }else{
- return -1;
- }
- }else{
- if($b->isDir()){
- return 1;
- }else{
- return strnatcasecmp ($a->getFilename(), $b->getFilename());
- }
- }
- });
- }
-
- /**
- * Get files in directory locally and remotely
- *
- * @param string $dir full path to directory
- * @return array of files
- */
- public function getFilesInDirectory($dir){
-
- if($this->validPathStr($dir) === false){
- throw new \Exception('Directory path is not valid. Possible security issue.');
- }
-
- $files = array();
- $basePath = $this->addEndingSlash($this->command->getGitEnvironment()->getPath());
- $relativePath = $dir;
- if($relativePath){
- $relativePath = $this->addEndingSlash($relativePath);
- }
-
-
- if($this->command->getGitEnvironment()->getSsh() === true){
- //Remote Directory Listing
- $directoryList = $this->command->getSftpProcess()->getDirectoryList($basePath.$relativePath);
-
- foreach($directoryList as $filename => $fileData) {
- if($filename !== '.' && $filename !== '..' && $filename !== '.git'){
- $fileData['fullPath'] = $basePath.rtrim($relativePath,'/').'/'.$filename;
- $fileData['gitPath'] = $relativePath.$filename;
-
- $remoteFileInfo = new RemoteFileInfo($fileData);
- if($remoteFileInfo->isFile()){
-
- }
- $files[] = $remoteFileInfo;
- }
- }
-
- }else{
- //Local Directory Listing
- $directoryIterator = new \DirectoryIterator($basePath.$dir);
- $directoryIterator->setInfoClass('\VersionControl\GitCommandBundle\Entity\FileInfo');
-
- foreach ($directoryIterator as $fileInfo) {
- if(!$fileInfo->isDot() && $fileInfo->getFilename() !== '.git'){
-
- $newFileInfo = $fileInfo->getFileInfo();
- $newFileInfo->setGitPath($relativePath.$fileInfo->getFilename());
-
- $files[] = $newFileInfo;
- }
- }
- }
-
- $this->sortFilesByDirectoryThenName($files);
-
- return $files;
- }
-
- public function readFile($file){
- //$basePath = $this->addEndingSlash($this->command->getGitEnvironment()->getPath());
- $fileContents = '';
-
- if($this->command->getGitEnvironment()->getSsh() === true){
-
-
- $fileContents = $this->command->getSftpProcess()->getFileContents($file->getFullPath());
-
-
- }else{
- $fileContents = file_get_contents($file->getFullPath());
- }
-
- return $fileContents;
- }
-
- /**
- * Checks for malicious file paths.
- *
- * Returns TRUE if no '//', '..', '\' or control characters are found in the $theFile.
- * This should make sure that the path is not pointing 'backwards' and further doesn't contain double/back slashes.
- * So it's compatible with the UNIX style path strings valid for TYPO3 internally.
- *
- * @param string $theFile File path to evaluate
- * @return boolean TRUE, $theFile is allowed path string, FALSE otherwise
- * @see http://php.net/manual/en/security.filesystem.nullbytes.php
- * @todo Possible improvement: Should it rawurldecode the string first to check if any of these characters is encoded?
- */
- public function validPathStr($theFile) {
- if (strpos($theFile, '//') === FALSE && strpos($theFile, '\\') === FALSE && !preg_match('#(?:^\\.\\.|/\\.\\./|[[:cntrl:]])#u', $theFile)) {
- return TRUE;
- }
- return FALSE;
- }
-
-
- public function setFilesPermissions($filePaths, $mode='0775'){
- $basePath = trim($this->addEndingSlash($this->command->getGitEnvironment()->getPath()));
- if($this->command->getGitEnvironment()->getSsh() === true){
- //Remote Directory Listing
- $permissions = octdec($mode);
- foreach($filePaths as $filepath){
- $this->command->runCommand(sprintf("chmod -R %s %s",$mode,escapeshellarg($filepath)));
- }
-
- }else{
- //Run local chmod
- }
- }
-
- public function setFilesOwnerAndGroup($filePaths,$user ='www-data',$group = 'fr_user'){
- $basePath = trim($this->addEndingSlash($this->command->getGitEnvironment()->getPath()));
- if($this->command->getGitEnvironment()->getSsh() === true){
- //Remote Directory Listing
- if(trim($user)){
- foreach($filePaths as $filepath){
- $this->command->runCommand(sprintf("chown -R %s %s",$user,escapeshellarg($filepath)));
- }
- }
- if(trim($group)){
- foreach($filePaths as $filepath){
- $this->command->runCommand(sprintf("chgrp -R %s %s",$group,escapeshellarg($filepath)));
- }
- }
- }else{
- //Run local chmod
- }
-
- }
-
-
- /**
- * Gets the git log (history) of commits
- * Currenly limits to the last 20 commits.
- * @return GitLog|array
- */
- public function getLog($count = 20, $branch = 'master', $fileName = false){
- $logs = array();
- $logData = '';
- try{
- //$logData = $this->command->runCommand('git --no-pager log --pretty=format:"%H | %h | %T | %t | %P | %p | %an | %ae | %ad | %ar | %cn | %ce | %cd | %cr | %s" -'.intval($count).' '.$branch);
- $command = 'git --no-pager log -m "--pretty=format:\'%H | %h | %T | %t | %P | %p | %an | %ae | %ad | %ar | %cn | %ce | %cd | %cr | %s\'" -'.intval($count).' ';
- if($branch && $branch != '(No Branch)'){
- $command .= escapeshellarg(trim($branch)).' ';
- }else{
- $command .= '-- ';
- }
- if($fileName !== false){
- $command .= ' -- '.escapeshellarg($fileName);
- }else{
- $command .= ' --';
- }
- $logData = $this->command->runCommand($command);
-
- }catch(RunGitCommandException $e){
- if($this->getObjectCount() == 0){
- return $logs;
- }else{
- throw new RunGitCommandException('Error in get log Command:'.$e->getMessage());
- //Throw exception
- }
- }
-
- $lines = $this->splitOnNewLine($logData);
-
- if(is_array($lines) && count($lines) > 0){
- foreach($lines as $line){
- if(trim($line)){
- $logs[] = new GitLog($line);
- }
- }
- }
-
- return $logs;
- }
-
- /**
- * Check if a file is ignored
- * EXIT STATUS
- 0
- One or more of the provided paths is ignored.
-
- 1
- None of the provided paths are ignored.
-
- 128
- A fatal error was encountered.
- *
- * @param string $filePath
- * @return boolean
- */
- public function isFileIgnored($filePath){
- try{
- $response = $this->command->runCommand(sprintf('git check-ignore %s',escapeshellarg($filePath)));
- }catch(RunGitCommandException $e){
- if($this->command->getLastExitStatus() == 128){
- throw $e;
- }elseif($this->command->getLastExitStatus() == 1){
- $response = false;
- }else{
- $response = true;
- }
- }
-
- return $response?true:false;
- }
-
- /**
- * Check if a file is been tracked by git
- * @param string $filePath
- * @return boolean
- */
- public function isFileTracked($filePath){
- $response = $this->command->runCommand(sprintf('git ls-files %s',escapeshellarg($filePath)));
- return $response?true:false;
- }
-
-
- public function ignoreFile($filePath){
- $response = '';
- if($this->fileExists($filePath)){
- if($this->filePathIsIgnored($filePath) === false){
- $response = $this->addToGitIgnore($filePath);
- }else{
- $response = "File in .gitignore already.\n";
- }
-
- $response .= $this->command->runCommand(sprintf('git rm --cached %s',escapeshellarg($filePath)));
-
- $response .= "\n Please commit to complete the removal of this file from git index";
- }else{
- throw new \Exception("File path was not valid. Please check that the file exists.");
- }
-
- return $response;
-
- }
-
- /**
- * Checks if a file exists
- * @param type $filePath FilePath excluding base path
- * @return type
- */
- public function fileExists($filePath){
- $fileExists = false;
- $basePath = trim($this->addEndingSlash($this->command->getGitEnvironment()->getPath()));
- if($this->command->getGitEnvironment()->getSsh() === true){
- $fileExists = $this->command->getSftpProcess()->fileExists($basePath.$filePath);
-
- }else{
- $fileExists = file_exists($basePath.$filePath);
- }
-
- return $fileExists;
- }
-
- public function filePathIsIgnored($filePath){
-
- $fileIgnored = false;
- $ignoreFiles = $this->getGitIgnoreFile();
-
- foreach($ignoreFiles as $ignoreFilePath){
- if($ignoreFilePath === '/'.$filePath){
- $fileIgnored = true;
- }
- }
-
- return $fileIgnored;
- }
-
- /**
- * Gets the contents of gitignore file and
- * splits on newline and returns it as an array
- * @return array
- */
- public function getGitIgnoreFile(){
- $ignoreFiles = array();
-
- $basePath = trim($this->addEndingSlash($this->command->getGitEnvironment()->getPath()));
- $fileData['fullPath'] = '.gitignore';
- $fileData['gitPath'] = '.gitignore';
-
- $remoteFileInfo = new RemoteFileInfo($fileData);
-
- $contents = $this->readFile($remoteFileInfo);
- $ignoreFiles = $this->splitOnNewLine($contents, true);
-
- return $ignoreFiles;
- }
-
- public function addToGitIgnore($filePath){
- if($this->fileExists('.gitignore')){
- //Update git ignore file
- if($this->command->getGitEnvironment()->getSsh() === true){
- //$fileContents = $this->command->getSftpProcess()->appendToFile('.gitignore',PHP_EOL.$filePath.PHP_EOL);
- $response = $this->command->runCommand(sprintf('echo %s >> .gitignore',escapeshellarg(PHP_EOL.$filePath)));
- }else{
- $fileContents = file_put_contents('.gitignore', PHP_EOL.$filePath , FILE_APPEND);
- }
- }else{
- //create file
- }
- return "File added to .gitignore\n";
- }
-}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php
deleted file mode 100644
index 57085ff..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php
+++ /dev/null
@@ -1,197 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-
-/**
- *
- * @author Paul Schweppe
- */
-class GitStatusCommand extends AbstractGitCommand {
-
- /**
- *
- * @var type Git Status Hash.
- * Used to make sure no changes has occurred since last check
- * @var string hash
- */
- protected $statusHash;
-
- /**
- * Get hash of git status
- * @return String hash
- */
- public function getStatusHash() {
- if(!$this->statusHash){
- $stausData = $this->getStatus();
- print_r('Status Hash data:'.$stausData);
- $this->statusHash = hash('md5',$stausData);
- }
- return $this->statusHash;
- }
-
- /**
- * Gets all files that need to be commited
- *
- * @return array Array of GitFile objects
- */
- public function getFilesToCommit(){
- $stausData = $this->getStatus();
- $this->statusHash = hash('md5',$stausData);
- $files = $this->processStatus($stausData);
- return $files;
- }
-
- /**
- * Git status command
- * Response:
- * D feedback.html
- * ?? time-selectors/work.html
- *
- * @return string Command Response
- */
- public function getStatus(){
- return $this->command->runCommand('git status -u --porcelain',true,false);
- }
-
- /**
- * Stage files for commit.
- * In the short-format, the status of each path is shown as
- * XY PATH1 -> PATH2
- * where PATH1 is the path in the HEAD, and the ` -> PATH2` part is shown only when PATH1 corresponds to a different path in the index/worktree (i.e. the file is renamed). The XY is a two-letter status code.
- *
- * The fields (including the ->) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped.
- * For paths with merge conflicts, X and Y show the modification states of each side of the merge. For paths that do not have merge conflicts, X shows the status of the index, and Y shows the status of the work tree. For untracked paths, XY are ??. Other status codes can be interpreted as follows:
- * ' ' = unmodified
- * M = modified
- * A = added
- * D = deleted
- * R = renamed
- * C = copied
- * U = updated but unmerged
-
- Ignored files are not listed, unless --ignored option is in effect, in which case XY are !!.
-
- X Y Meaning
- -------------------------------------------------
- [MD] not updated
- M [ MD] updated in index
- A [ MD] added to index
- D [ M] deleted from index
- R [ MD] renamed in index
- C [ MD] copied in index
- [MARC] index and work tree matches
- [ MARC] M work tree changed since index
- [ MARC] D deleted in work tree
- -------------------------------------------------
- D D unmerged, both deleted
- A U unmerged, added by us
- U D unmerged, deleted by them
- U A unmerged, added by them
- D U unmerged, deleted by us
- A A unmerged, both added
- U U unmerged, both modified
- -------------------------------------------------
- ? ? untracked
- ! ! ignored
- -------------------------------------------------
- If -b is used the short-format status is preceded by a line
- * @TODO: No Support for copy yet
- * @param array $files
- */
- public function stageFiles(array $files){
- $gitFiles = $this->getFilesToCommit();
-
- //Validated that this status is same as previous
- $deleteFiles = array();
- $addFiles = array();
-
- $flippedFiles = array_flip($files);
-
- foreach($gitFiles as $fileEntity){
- if(isset($flippedFiles[$fileEntity->getPath1()])){
- if($fileEntity->getWorkTreeStatus() == '!' || $fileEntity->getWorkTreeStatus() == '!' ){
- //do Nothing ignore
- }elseif(($fileEntity->getIndexStatus() == ' ' || $fileEntity->getIndexStatus() == 'M' || $fileEntity->getIndexStatus() == 'A') && $fileEntity->getWorkTreeStatus() == 'D'){
- //Delete files
- //[ MA] D deleted in work tree
- $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
- }elseif($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'D')){
- //Rename delete
- //[R] D deleted in work tree
- //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
- $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
- }elseif($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'M' || $fileEntity->getWorkTreeStatus() == 'A' || $fileEntity->getWorkTreeStatus() == ' ')){
- //Rename ADD
- //[R] [ M]
- //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
- $addFiles[] = escapeshellarg($fileEntity->getPath2());
- }elseif($fileEntity->getWorkTreeStatus() == ' '){
- //[MARC] index and work tree matches
- //Do Nothing
- }else{
- $addFiles[] = escapeshellarg($fileEntity->getPath1());
- }
- }
- }
-
-
- //Run the commands once for add and delete
- if(count($deleteFiles) > 0){
- $this->command->runCommand('git rm '.implode(' ',$deleteFiles));
- }
-
- if(count($addFiles) > 0){
- $this->command->runCommand('git add '.implode(' ',$addFiles));
- }
-
-
- }
-
- /**
- * Stages the file to be committed.
- * Currently supports adding and removing file.
- *
- * @TODO Make it more effecient
- * @param string $file path to file to commit
- */
- public function stageFile($file){
- $this->stageFiles(array($file));
- }
-
-
-
- /**
- * Process the git status data into GitFile objects
- *
- * @param string $stausData
- * @return array Array of GitFile objects
- */
- protected function processStatus($stausData){
- $files = array();
-
- $lines = $this->splitOnNewLine($stausData,false);
-
- if(is_array($lines) && count($lines) > 0){
- foreach($lines as $line){
- if(trim($line)){
- $files[] = new GitFile($line,$this->command->getGitPath());
- }
- }
- }
-
- return $files;
- }
-
-
-
-}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php
deleted file mode 100644
index ebea64b..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php
+++ /dev/null
@@ -1,247 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-/**
- * Git uses a collaboration modal,which gives every developer their own copy of the repository, complete with its own
- * local history and branch structure. Users typically need to share a series of commits rather than a single changeset.
- * Instead of committing a changeset from a working copy to the central repository, Git lets you share entire branches
- * between repositories.
- *
- * The commands below let you manage connections with other repositories,
- * publish local history by “pushing” branches to other repositories,
- * and see what others have contributed by “pulling” branches into your local repository.
- * Commands:
- * remote
- * fetch
- * push
- * pull
- *
- * @author Paul Schweppe
- */
-class GitSyncCommand extends AbstractGitCommand {
-
- protected $pullRebase = false;
-
- /**
- * List the remote connections you have to other repositories.
- *
- * $ git remote
- * origin
- *
- * @return array() Array of remote names
- */
- public function getRemotes(){
-
- $remotes = $this->splitOnNewLine($this->command->runCommand('git remote'));
- return $remotes;
- }
-
- /**
- * List the remote connections you have to other repositories with "URL"
- * $ git remote -v
- * origin https://github.com/schacon/ticgit (fetch)
- * origin https://github.com/schacon/ticgit (push)
- * pb https://github.com/paulboone/ticgit (fetch)
- * pb https://github.com/paulboone/ticgit (push)
- *
- * @return array eg (array(0 => "origin", 1 => "https://github.com/schacon/ticgit", 2 => "(push)")
- */
- public function getRemoteVersions(){
- $remotes = array();
-
- $lines = $this->splitOnNewLine($this->command->runCommand('git remote -v'));
-
- if(count($lines) >= 2){
- for($i = 1; $i < count($lines); $i+=2){
- $parts = preg_split('/\s+/', $lines[$i]);
- if($parts[2] == "(push)"){
- $remotes[] = $parts;
- }
- }
- }
- return $remotes;
-
- }
-
- /**
- * Create a new connection to a remote repository. After adding a remote, you’ll be able to use
- * $remote as a convenient shortcut for $url in other Git commands.
- *
- * It’s generally not possible to push commits to a HTTP address.
- * For read-write access, you should use SSH instead.
- *
- * @param string $remote
- * @param string $url
- * @return string
- */
- public function addRemote($remote,$url){
-
- $remotes = $this->command->runCommand(sprintf('git remote add %s %s 2>&1',escapeshellarg($remote),escapeshellarg($url)));
- return $remotes;
- }
-
- /**
- * Remove the connection to the remote repository called $remote.
- *
- * @param string $remote
- * @return string
- */
- public function deleteRemote($remote){
-
- $remotes = $this->command->runCommand(sprintf('git remote rm %s 2>&1',escapeshellarg($remote)));
-
- return $remotes;
- }
-
- /**
- * Remove the connection to the remote repository called $remote.
- *
- * @param string $remote
- * @return string
- */
- public function renameRemote($remote,$newRemote){
-
- $remotes = $this->command->runCommand(sprintf('git remote rename %s %s 2>&1',escapeshellarg($remote),escapeshellarg($newRemote)));
-
- return $remotes;
- }
-
- /**
- * Fetch all of the branches from the repository.
- *
- * @param remote $remote Name of remote Repository
- * @return string command response
- */
- public function fetchAll($remote){
-
- return $this->command->runCommand(sprintf('git fetch %s 2>&1',escapeshellarg($remote)));
- }
-
- /**
- * Fetch changes from the remote server
- *
- * @param remote $remote Name of remote Repository
- * @param string $branch Branch to fetch
- * @return string command response
- */
- public function fetch($remote,$branch){
- //return $this->command->runCommand(sprintf('git pull %s %s "2>&1"',escapeshellarg($remote),escapeshellarg($branch)));
- return $this->command->runCommand(sprintf('git fetch %s %s 2>&1',escapeshellarg($remote),escapeshellarg($branch)));
- }
-
- /**
- *
- * @return string command response
- */
- public function resetPullRequest(){
- $response = $this->command->runCommand('git reset --hard ORIG_HEAD');
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
- /**
- * Push specified branch to the remote repository
- *
- * @param remote $remote The remote server to push to eg origin
- * @param string $branch The branch to push to the remote server eg master
- * @return string command response
- */
- public function push($remote,$branch){
-
- $command = sprintf('git push %s %s',escapeshellarg(trim($remote)),escapeshellarg(trim($branch)));
-
- return $this->command->runCommand($command);
- }
-
- /**
- * Push all of your local branches to the specified remote repository
- *
- * @param remote $remote The remote server to push to eg origin
- * @return string command response
- */
- public function pushAll($remote){
-
- $command = sprintf('git push %s --all',escapeshellarg($remote));
- return $this->command->runCommand($command);
- }
-
- /**
- * Tags are not automatically pushed when you push a branch or use the --all option.
- * The --tags flag sends all of your local tags to the remote repository.
- *
- * @param remote $remote The remote server to push to eg origin
- * @return string command response
- */
- public function pushTags($remote){
-
- $command = sprintf('git push %s --tags 2>&1',escapeshellarg($remote));
- return $this->command->runCommand($command);
- }
-
- /**
- * Pull changes to the remote repository
- *
- * @param remote $remote The remote server to push to eg origin
- * @param string $branch The branch to push to the remote server eg master
- * @return string command response
- */
- public function pull($remote,$branch){
- $command = 'git pull';
- if($this->pullRebase){
- $command .= ' --rebase';
- }
-
- $command = sprintf($command.' %s %s',escapeshellarg($remote),escapeshellarg($branch));
-
- $response = $this->command->runCommand($command);
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
- /**
- * Gets the number of commits ahead and behind a remote branch.
- * Needs to call fetch first
- *
- * This request should support caching
- *
- * @param string $branch local branch name
- * @param string $remote remote branch name
- * @return array
- */
- public function commitCountWithRemote($branch){
- $pushCount = 0;
- $pullCount = 0;
-
- $remotes = $this->getRemotes();
- if(count($remotes) > 0){
- $remoteBranch = $remotes[0].'/'.$branch;
- try{
- $command = sprintf('git rev-list --count --left-right %s...%s',escapeshellarg(trim($branch)),escapeshellarg(trim($remoteBranch)));
- $response = $this->command->runCommand($command);
-
- list($pushCount,$pullCount) = explode(' ',$response);
- }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e){
- //Remote branch does not exist. Do nothing
- }
- }
-
- return array('pushCount'=>trim($pushCount),'pullCount'=>trim($pullCount) );
- }
-
-}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUndoCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUndoCommand.php
deleted file mode 100644
index 44af0ac..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/Command/GitUndoCommand.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\GitCommands\Command;
-
-
-/**
- *
- * @author Paul Schweppe
- */
-class GitUndoCommand extends AbstractGitCommand {
-
- /**
- *
- * @return string command response
- */
- public function resetPullRequest(){
- return $this->command->runCommand('git reset --hard ORIG_HEAD');
- }
-
- /**
- * Reverts commit but keeps the files unchanged.
- * @return string command response
- */
- public function undoCommit(){
- return $this->command->runCommand('git reset --soft HEAD~1');
- }
-
- /**
- *
- * @return string command response
- */
- public function undoCommitHard(){
- return $this->command->runCommand('git reset --hard HEAD~1');
- }
-
- /**
- * Update all files in the working directory to match the specified commit.
- * You can use either a commit hash or a tag as the $commitHash argument.
- * This will put you in a detached HEAD state.
- */
- public function checkoutCommit($commitHash = 'HEAD'){
- $response = $this->command->runCommand(sprintf('git checkout %s 2>&1',escapeshellarg($commitHash)));
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
- /**
- * Check out a previous version of a file. This turns the that resides in the working directory into an
- * exact copy of the one from and adds it to the staging area.
- *
- * @param string $file
- * @param string $commitHash
- * @return string
- */
- public function checkoutFile($file, $commitHash = 'HEAD'){
- $response = $this->command->runCommand(sprintf('git checkout %s %s',escapeshellarg($commitHash),escapeshellarg($file)));
-
- //Trigger file alter Event
- $this->triggerGitAlterFilesEvent();
-
- return $response;
- }
-
-}
diff --git a/src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php b/src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php
deleted file mode 100644
index ed3e4ef..0000000
--- a/src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php
+++ /dev/null
@@ -1,386 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace VersionControl\GitCommandBundle\GitCommands;
-
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Stopwatch\Stopwatch;
-
-use VersionControl\GitCommandBundle\Service\SshProcessInterface;
-use VersionControl\GitCommandBundle\Service\SftpProcessInterface;
-use VersionControl\GitCommandBundle\GitCommands\Command as Command;
-use VersionControl\GitCommandBundle\GitCommands\Exception\InvalidArgumentException;
-use VersionControl\GitCommandBundle\Logger\GitCommandLogger;
-use VersionControl\GitCommandBundle\Event\GitAlterFilesEvent;
-use VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException;
-
-
-use VersionControl\GitCommandBundle\GitCommands\GitEnvironmentInterface;
-
-
-/**
- * @author Paul Schweppe
- */
-class GitCommand {
-
- protected $gitPath;
-
- /**
- * @var TokenStorage
- */
- protected $securityContext;
-
- /**
- * The git gitEnvironment entity
- * @var GitEnvironmentInterface
- */
- protected $gitEnvironment;
-
-
- /**
- * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
- */
- public $dispatcher;
-
- /**
- * Git Command Logger
- * @var \VersionControl\GitCommandBundle\Logger\GitCommandLogger
- */
- protected $logger;
-
- /**
- * Symfony's debugging Stopwatch.
- *
- * @var Stopwatch|null
- */
- private $stopwatch;
-
- /**
- * SSH Process
- * @var \VersionControl\GitCommandBundle\Service\SshProcessInterface
- */
- private $sshProcess;
-
- /**
- * Sftp Process
- * @var \VersionControl\GitCommandBundle\Service\SftpProcessInterface
- */
- private $sftpProcess;
-
- /**
- * Cache in memory
- * @var \Doctrine\Common\Cache\CacheProvider
- */
- private $cache;
-
- /**
- * Last Exit code of local command
- * @var integer
- */
- private $exitCode;
-
-
- /**
- * Wrapper function to run shell commands. Supports local and remote commands
- * depending on the gitEnvironment details
- *
- * @param string $command command to run
- * @param boolean $cacheCommand command to run
- * @param boolean $trim do not trim response. Maybe need for some command responses
- * @return string Result of command
- * @throws \RuntimeException
- */
- public function runCommand($command,$cacheCommand = true,$trim=true){
-
- $response = '';
- if ($this->stopwatch) {
- $this->stopwatch->start('git_request', 'version_control');
- }
-
- $fullCommand = sprintf('cd %s && %s',$this->gitPath,$command);
- $cacheId = md5($this->gitEnvironment->getId().$fullCommand);
-
- if($this->gitEnvironment->getSsh() === true){
- //Run remote command over ssh
-
- if($cacheCommand === true){
- $response = $this->cache->fetch($cacheId);
- if ($response === false) {
- $response = $this->runRemoteCommand($fullCommand);
- $this->cache->save($cacheId, $response);
- }
- }else{
- $response = $this->runRemoteCommand($fullCommand);
- }
- }else{
- //Run local commands
- $start = microtime(true);
- $response = $this->runLocalCommand($command);
-
- $this->logCommand($fullCommand,'local',array(),$start);
- }
-
- return $trim===true?trim($response):$response;
- }
-
- /**
- * Run remote command over ssh
- * @param string $fullCommand
- * @return string Commands response
- */
- private function runRemoteCommand($fullCommand){
- $start = microtime(true);
-
- $this->sshProcess->run(array($fullCommand),$this->gitEnvironment->getHost(),$this->gitEnvironment->getUsername()
- ,22,$this->gitEnvironment->getPassword(),null
- ,$this->gitEnvironment->getPrivateKey(),$this->gitEnvironment->getPrivateKeyPassword());
- $this->logCommand($fullCommand,'remote',array('host'=>$this->gitEnvironment->getHost()),$start,$this->sshProcess->getStdout(),$this->sshProcess->getStderr(),$this->sshProcess->getExitStatus());
-
- return $this->sshProcess->getStdout();
- }
-
- /**
- * Run local command
- * @param string $command
- * @return string Commands response
- */
- private function runLocalCommand($command){
-
- $fullCommand = sprintf('cd %s && %s',$this->gitPath,$command);
-
- //Run local commands
- if(is_array($command)){
- //$finalCommands = array_merge(array('cd',$this->gitPath,'&&'),$command);
- $builder = new ProcessBuilder($command);
- $builder->setPrefix('cd '.$this->gitPath.' && ');
- $process = $builder->getProcess();
- }else{
- $process = new Process($fullCommand);
- }
-
- //Run Proccess
- $process->run();
-
- $this->exitCode = $process->getExitCode();
-
- $response = '';
- // executes after the command finishes
- if ($process->isSuccessful()) {
- $response = $process->getOutput();
- if(trim($process->getErrorOutput()) !== ''){
- $response = $process->getErrorOutput();
- }
- }else{
- if(trim($process->getErrorOutput()) !== ''){
- throw new RunGitCommandException($process->getErrorOutput());
- }
- }
-
- return $response;
- }
-
- public function getLastExitStatus(){
- if($this->gitEnvironment->getSsh() === true){
- return $this->sshProcess->getExitStatus();
- }else{
- return $this->exitCode;
- }
- }
-
-
- /**
- * Gets the git path
- * @return type
- */
- public function getGitPath() {
- return $this->gitPath;
- }
-
- /**
- * Sets the git path.
- * @param string $gitPath
- * @return \VersionControl\GitCommandBundle\GitCommands
- */
- protected function setGitPath($gitPath) {
- $this->gitPath = rtrim(trim($gitPath),'/');
- return $this;
- }
-
-
- /**
- * Sets the Git Environment
- * @param GitEnvironmentInterface $gitEnvironment
- * @return \VersionControl\GitCommandBundle\GitCommands\GitCommand
- */
- public function setGitEnvironment(GitEnvironmentInterface $gitEnvironment){
- $this->gitEnvironment = $gitEnvironment;
- $this->setGitPath($this->gitEnvironment->getPath());
- return $this;
- }
-
- /**
- * Allows you to override the git Environment
- * @param GitEnvironmentInterface $gitEnvironment
- * @return \VersionControl\GitCommandBundle\GitCommands\GitCommand
- */
- public function overRideGitEnvironment(GitEnvironmentInterface $gitEnvironment){
- $this->gitEnvironment = $gitEnvironment;
- $this->setGitPath($this->gitEnvironment->getPath());
- return $this;
- }
-
- /**
- * Gets git Environment
- * @return type
- */
- public function getGitEnvironment() {
- return $this->gitEnvironment;
- }
-
- public function getSecurityContext() {
- return $this->securityContext;
- }
-
- public function setSecurityContext(TokenStorage $securityContext) {
- $this->securityContext = $securityContext;
-
- }
-
- public function getDispatcher() {
- return $this->dispatcher;
- }
-
- public function setDispatcher(\Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher) {
- $this->dispatcher = $dispatcher;
- return $this;
- }
-
- public function triggerGitAlterFilesEvent($eventName = 'git.alter_files'){
- $event = new GitAlterFilesEvent($this->gitEnvironment,array());
- $this->dispatcher->dispatch($eventName, $event);
- }
-
- public function getLogger() {
- return $this->logger;
- }
-
- public function setLogger(GitCommandLogger $logger) {
- $this->logger = $logger;
- return $this;
- }
-
- /**
- * Sets a stopwatch instance for debugging purposes.
- *
- * @param Stopwatch $stopwatch
- */
- public function setStopwatch(Stopwatch $stopwatch = null)
- {
- $this->stopwatch = $stopwatch;
- }
- /**
- * Log the query if we have an instance of ElasticaLogger.
- *
- * @param string $command
- * @param string $method
- * @param array $data
- * @param int $start
- */
- public function logCommand($command, $method, $data, $start, $response='', $error='', $exitStatus=0)
- {
- if (!$this->logger or !$this->logger instanceof GitCommandLogger) {
- return;
- }
- $time = microtime(true) - $start;
-
- $this->logger->logCommand($command, $method, $data, $time, $response, $error, $exitStatus);
- }
-
- /**
- * Sets the SSH Process
- * @param SshProcess $sshProcess
- * @return \VersionControl\GitCommandBundle\GitCommands\GitCommand
- */
- public function setSshProcess(SshProcessInterface $sshProcess) {
- $this->sshProcess = $sshProcess;
- return $this;
- }
-
- /**
- * Sets the SFTP Process
- * @param SshProcess $sftpProcess
- * @return \VersionControl\GitCommandBundle\GitCommands\GitCommand
- */
- public function setSftpProcess(SftpProcessInterface $sftpProcess) {
- $this->sftpProcess = $sftpProcess;
- return $this;
- }
-
- /**
- * Gets the SFTP Process
- *
- * @return \VersionControl\GitCommandBundle\Service\SftpProcessInterface
- */
- public function getSftpProcess() {
- $this->sftpProcess->setGitEnviroment($this->gitEnvironment);
- return $this->sftpProcess;
- }
-
- public function setCache(\Doctrine\Common\Cache\CacheProvider $cache){
- $this->cache = $cache;
- }
-
- /**
- * Get git command groups
- * @param string $name
- * @return \VersionControl\GitCommandBundle\GitCommands\GitCommand
- * @throws InvalidArgumentException
- */
- public function command($name){
- switch (trim($name)) {
- case 'branch':
- $command = new Command\GitBranchCommand($this);
- break;
- case 'commit':
- $command = new Command\GitCommitCommand($this);
- break;
- case 'diff':
- $command = new Command\GitDiffCommand($this);
- break;
- case 'files':
- $command = new Command\GitFilesCommand($this);
- break;
- case 'init':
- $command = new Command\GitInitCommand($this);
- break;
- case 'log':
- $command = new Command\GitLogCommand($this);
- break;
- case 'status':
- $command = new Command\GitStatusCommand($this);
- break;
- case 'sync':
- $command = new Command\GitSyncCommand($this);
- break;
- case 'undo':
- $command = new Command\GitUndoCommand($this);
- break;
- default:
- throw new InvalidArgumentException(sprintf('Unknown command instance called: "%s"', $name));
- }
-
- return $command;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/VersionControl/GitCommandBundle/Service/SshProcess.php b/src/VersionControl/GitCommandBundle/Service/SshProcess.php
deleted file mode 100644
index b32cd5b..0000000
--- a/src/VersionControl/GitCommandBundle/Service/SshProcess.php
+++ /dev/null
@@ -1,227 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitCommandBundle\Service;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use VersionControl\GitCommandBundle\Service\SshProcessInterface;
-
-/**
- * Uses php SSH2 library to run SSH Process
- *
- * @author Paul Schweppe
- */
-class SshProcess implements SshProcessInterface
-{
-
-
- /**
- * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
- */
- protected $dispatcher;
-
- /**
- * @var array
- */
- protected $config;
-
- /**
- * @var resource
- */
- protected $session;
-
- /**
- * @var resource
- */
- protected $shell;
-
- /**
- * @var array
- */
- protected $stdout;
-
- /**
- * @var array
- */
- protected $stderr;
-
- /**
- * //EventDispatcherInterface $eventDispatcher,
- * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
- * @param array $config
- */
- public function __construct()
- {
- //$this->dispatcher = $eventDispatcher;
-
- $this->session = null;
- $this->shell = null;
- $this->stdout = array();
- $this->stdin = array();
- $this->stderr = array();
- }
-
- /**
- * @param string $glue
- * @return array|string
- */
- public function getStdout($glue = "\n")
- {
- if (!$glue) {
- $output = $this->stdout;
- }else{
- $output = implode($glue, $this->stdout);
- }
-
- return $output;
- }
-
- /**
- * @param string $glue
- * @return array|string
- */
- public function getStderr($glue = "\n")
- {
- if (!$glue) {
- return $this->stderr;
- }
-
- return implode($glue, $this->stderr);
- }
-
- /**
- *
- * @param array $commands
- * @param string $host
- * @param string $username
- * @param integer $port
- * @param string $password
- * @param string $pubkeyFile
- * @param string $privkeyFile
- * @param string $passphrase
- * @return type
- */
- public function run(array $commands,$host,$username,$port=22,$password=null,$pubkeyFile=null,$privkeyFile=null,$passphrase=NULL)
- {
- $this->reset();
-
- if($this->shell === NULL){
- $this->connect($host,$username,$port,$password,$pubkeyFile,$privkeyFile,$passphrase);
- }
-
- foreach ($commands as $command) {
- $this->execute($command);
- }
-
- //$this->disconnect();
-
- return $this->stdout;
- }
-
- /**
- * Resets out puts for next command
- */
- protected function reset(){
- $this->stdout = array();
- $this->stdin = array();
- $this->stderr = array();
- }
-
- /**
- * @throws \InvalidArgumentException|\RuntimeException
- * @param array $connection
- * @return void
- */
- protected function connect($host,$username,$port=22,$password=null,$pubkeyFile=null,$privkeyFile=null,$passphrase=NULL)
- {
-
- $this->session = ssh2_connect($host, $port);
-
- if (!$this->session) {
- throw new \InvalidArgumentException(sprintf('SSH connection failed on "%s:%s"', $host, $port));
- }
-
- if (isset($username) && $pubkeyFile != null && $privkeyFile != null) {
- if (!ssh2_auth_pubkey_file($username, $pubkeyFile, $privkeyFile, $passphrase)) {
- throw new \InvalidArgumentException(sprintf('SSH authentication failed for user "%s" with public key "%s"', $username, $pubkeyFile));
- }
- } else if ($username && $password) {
- if (!ssh2_auth_password($this->session, $username,$password)) {
- throw new \InvalidArgumentException(sprintf('SSH authentication failed for user "%s"', $username));
- }
- }
-
- $this->shell = ssh2_shell($this->session);
-
- if (!$this->shell) {
- throw new \RuntimeException(sprintf('Failed opening shell'));
- }
-
- $this->stdout = array();
- $this->stdin = array();
- }
-
- /**
- * @return void
- */
- public function disconnect()
- {
- if($this->shell){
- fclose($this->shell);
- }
- }
-
- /**
- * @param array $command
- * @return void
- */
- protected function execute($command)
- {
-
- //$this->dispatcher->dispatch(Events::onDeploymentSshStart, new CommandEvent($command));
-
- $outStream = ssh2_exec($this->session, $command);
- $errStream = ssh2_fetch_stream($outStream, SSH2_STREAM_STDERR);
-
- stream_set_blocking($outStream, true);
- stream_set_blocking($errStream, true);
-
- $stdout = explode("\n", stream_get_contents($outStream));
- $stderr = explode("\n", stream_get_contents($errStream));
-
- if (count($stdout)) {
-
- //$this->dispatcher->dispatch(Events::onDeploymentRsyncFeedback, new FeedbackEvent('out', implode("\n", $stdout)));
- }
-
- if (count($stderr) > 1) {
- //print_r($stderr);
- throw new \RuntimeException(sprintf("Error in command shell:%s \n Error Response:%s",$command,implode("\n", $stderr)));
- //$this->dispatcher->dispatch(Events::onDeploymentRsyncFeedback, new FeedbackEvent('err', implode("\n", $stderr)));
- }
-
- $this->stdout = array_merge($this->stdout, $stdout);
-
- if (is_array($stderr)) {
- $this->stderr = array_merge($this->stderr, $stderr);
- } else {
- //$this->dispatcher->dispatch(Events::onDeploymentSshSuccess, new CommandEvent($command));
- }
-
- fclose($outStream);
- fclose($errStream);
- }
-
- public function __destruct() {
- $this->disconnect();
- }
-
-}
-
-
diff --git a/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitCommitCommandTest.php b/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitCommitCommandTest.php
deleted file mode 100644
index e6638f8..0000000
--- a/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitCommitCommandTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace VersionControl\GitCommandBundle\Tests\GitCommands\Command;
-
-use VersionControl\GitCommandBundle\Tests\GitCommandTestCase;
-/**
- * Description of GitBranchCommandTest
- *
- * @author fr_user
- */
-class GitCommitCommandTest extends GitCommandTestCase{
-
- /**
- * setUp, called on every method
- */
- public function setUp()
- {
- $this->initGitCommandsLocal();
- $this->gitCommands->command('init')->initRepository();
- $this->addFile('test');
- $this->gitCommands->command('commit')->stageAll();
- $this->gitCommands->command('commit')->commit('first commit','Paul Schweppe ');
- $this->addFile('test2');
- $this->gitCommands->command('commit')->stageAll();
- $this->gitCommands->command('commit')->commit('Second commit','Paul Schweppe ');
- }
-
- /**
- * Test Getting commit files
- */
- public function testGetFilesToCommit(){
- $this->addFile('test3.txt');
- $this->updateFile('test2','Test content');
-
- $files = $this->gitCommands->command('commit')->getFilesToCommit();
- $this->assertCount(2, $files, 'Files to commit returns more to 2 enitities ');
- foreach($files as $gitFile){
- $this->assertInstanceOf("\VersionControl\GitCommandBundle\Entity\GitFile", $gitFile);
- }
- $gitFile1 = $files[0];
- $this->assertEquals("", $gitFile1->getFileType(),'File type failed for git file 1');
- $this->assertEquals(" ", $gitFile1->getIndexStatus(),'Index Status failed for git file 1');
- $this->assertEquals("test2", $gitFile1->getPath1(),'Path 1 failed for git file 1');
- $this->assertEquals("M", $gitFile1->getWorkTreeStatus(),'Work tree status failed for git file 1');
- $this->assertEquals("", $gitFile1->getPath2(),'Path 2 failed for git file 1');
-
- $gitFile2 = $files[1];
- $this->assertEquals("", $gitFile2->getFileType(),'File type failed for git file 2');
- $this->assertEquals("test3.txt", $gitFile2->getPath1(),'Path 1 failed for git file 2');
- $this->assertEquals("?", $gitFile2->getIndexStatus(),'Index Status failed for git file 2');
- $this->assertEquals("?", $gitFile2->getWorkTreeStatus(),'Work tree status failed for git file 2');
- $this->assertEquals("", $gitFile2->getPath2(),'Path 2 failed for git file 2');
-
- }
-
-
-}
diff --git a/src/VersionControl/GitControlBundle/Controller/Base/BaseProjectController.php b/src/VersionControl/GitControlBundle/Controller/Base/BaseProjectController.php
deleted file mode 100644
index 5a43c19..0000000
--- a/src/VersionControl/GitControlBundle/Controller/Base/BaseProjectController.php
+++ /dev/null
@@ -1,177 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller\Base;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
-/**
- * Base Project controller.
- * @abstract
- */
-abstract class BaseProjectController extends Controller{
-
- /**
- * The current Project Entity
- * @var Project
- */
- protected $project;
-
- /**
- * Array of variables the will be past to the twig templating engine
- * @var array
- */
- protected $viewVariables = array();
-
- /**
- * The current branch name
- * @var string
- */
- protected $branchName;
-
- /**
- *
- * @var GitCommand
- */
- protected $gitCommands;
-
- protected $projectGrantType = 'VIEW';
-
- /**
- * Allow access by ajax only request
- * @var boolean
- */
- protected $ajaxOnly = true;
-
- /**
- *
- * @param VersionControl\GitControlBundle\Entity\Project $project
- * @throws AccessDeniedException
- */
- protected function checkProjectAuthorization(\VersionControl\GitControlBundle\Entity\Project $project,$grantType='MASTER'){
- $authorizationChecker = $this->get('security.authorization_checker');
-
- // check for edit access
- if (false === $authorizationChecker->isGranted($grantType, $project)) {
- throw new AccessDeniedException();
- }
- }
-
- /**
- * Generates a URL from the given parameters adding project id.
- *
- * @param string $route The name of the route
- * @param mixed $parameters An array of parameters
- * @param int $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
- *
- * @return string The generated URL
- *
- * @see UrlGeneratorInterface
- */
- public function generateUrl($route, $parameters = array(),$referenceType = UrlGeneratorInterface::ABSOLUTE_PATH) {
- if($this->project){
- $mergedParameters = array_merge(array('id'=>$this->project->getId()),$parameters);
- }
- return parent::generateUrl($route, $mergedParameters,$referenceType);
- }
-
- /**
- *
- * @param integer $id
- */
- public function initAction($id,$grantType = 'VIEW'){
-
- $em = $this->getDoctrine()->getManager();
-
- $this->project= $em->getRepository('VersionControlGitControlBundle:Project')->find($id);
-
- if (!$this->project) {
- throw $this->createNotFoundException('Unable to find Project entity.');
- }
-
- //Redirect is not ajax
- $request = $this->container->get('request_stack')->getCurrentRequest();
- //$request = $this->getRequest();
- if( $this->ajaxOnly == true && !$request->isXmlHttpRequest()){
-
- //print_r($request->getRequestUri());
- return $this->generateUrl('project',array('section'=> urlencode($request->getRequestUri())));
- }
-
- $this->checkProjectAuthorization($this->project,$grantType);
-
- $projectEnvironment = $this->getProjectEnvironment();
-
- $this->gitCommands = $this->get('version_control.git_commands')->setGitEnvironment($projectEnvironment);
-
- $this->branchName = $this->gitCommands->command('branch')->getCurrentBranch();
-
- $this->viewVariables = array_merge($this->viewVariables, array(
- 'project' => $this->project,
- 'branchName' => $this->branchName,
- ));
-
-
-
- }
-
- /**
- * Sets the project entity
- * @param Project $project
- */
- public function getProjectEnvironment() {
- $projectEnvironmentStorage = $this->get('version_control.project_environmnent_storage');
- return $projectEnvironmentStorage->getProjectEnviromment($this->project);
- }
-
- /**
- * Sets the container.
- *
- * @param ContainerInterface|null $container A ContainerInterface instance or null
- */
- /*public function setContainer(ContainerInterface $container = null){
- $this->container = $container;
- $request = $this->container->get('request_stack')->getCurrentRequest();
- $id = $request->get('id', false);
- if($id){
- $grantType = $this->getGrantType();
- print_r($grantType);
- $this->initAction($id,$grantType);
- }
- }*/
-
- public function getGrantType(){
- return $this->projectGrantType;
- }
-
- public function getProjectGrantType() {
- return $this->projectGrantType;
- }
-
- public function setProjectGrantType($projectGrantType) {
- $this->projectGrantType = $projectGrantType;
- return $this;
- }
-
-
-
-}
-
diff --git a/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php b/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php
deleted file mode 100644
index c80e505..0000000
--- a/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php
+++ /dev/null
@@ -1,278 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Controller;
-
-use VersionControl\GitControlBundle\Controller\Base\BaseProjectController;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use VersionControl\GitControlBundle\Entity\Project;
-use VersionControl\GitControlBundle\Form\ProjectType;
-
-use Symfony\Component\Validator\Constraints\NotBlank;
-use VersionControl\GitControlBundle\Entity\UserProjects;
-use VersionControl\GitCommandBundle\GitCommands\GitCommand;
-
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\HttpFoundation\Request;
- /** ///Route("/example", service="example_bundle.controller.example_controller") */
-use VersionControl\GitControlBundle\Annotation\ProjectAccess;
-/**
- * Project controller.
- *
- * @Route("/project/{id}/remote")
- */
-class ProjectRemoteController extends BaseProjectController
-{
-
- /**
- *
- * @var GitCommand
- */
- protected $gitCommands;
-
- /**
- *
- * @var GitCommand
- */
- protected $gitSyncCommands;
-
- protected $projectGrantType = 'EDIT';
-
- /**
- * Form to choose which brabch and remote a user will pull.
- * This is just the form. Also see pullToLocal()
- *
- * @Route("/", name="project_listremote")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="MASTER")
- */
- public function listAction($id){
- $gitRemoteVersions = array();
- try{
- $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return array_merge($this->viewVariables, array(
- 'remotes' => $gitRemoteVersions,
- 'branchName' => $this->branchName
- ));
- }
-
- /**
- * Form to choose which brabch and remote a user will pull.
- * This is just the form. Also see pullToLocal()
- *
- * @Route("/new/", name="project_newremote")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="MASTER")
- */
- public function newAction($id){
-
- $remoteForm = $this->createRemoteForm();
-
-
- return array_merge($this->viewVariables, array(
- 'remote_form' => $remoteForm->createView(),
- 'branchName' => $this->branchName
- ));
- }
-
-
- /**
- * Form to choose which brabch and remote a user will pull.
- * This is just the form. Also see pullToLocal()
- *
- * @Route("/create/", name="project_createremote")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectRemote:new.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function createAction(Request $request,$id)
- {
-
-
- $addRemoteForm = $this->createRemoteForm();
- $addRemoteForm->handleRequest($request);
-
- if ($addRemoteForm->isValid()) {
- $data = $addRemoteForm->getData();
- $remote = $data['remoteName'];
- $url = $data['remoteUrl'];
-
- try{
- //Remote Server choice
- $response = $this->gitSyncCommands->addRemote($remote,$url);
- $this->get('session')->getFlashBag()->add('notice', $response);
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
- }
-
-
- return array_merge($this->viewVariables, array(
- 'pull_form' => $addRemoteForm->createView(),
- 'diffs' => array()
- ));
- }
-
- /**
- * Form to choose which brabch and remote a user will pull.
- * This is just the form. Also see pullToLocal()
- *
- * @Route("/delete/{remote}", name="project_deleteremote")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="MASTER")
- */
- public function deleteAction(Request $request,$id,$remote){
-
- try{
- $response = $this->gitSyncCommands->deleteRemote($remote);
- $this->get('session')->getFlashBag()->add('notice', $response);
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
- return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
- }
-
-
- /**
- * Create rename remote form.
- *
- * @Route("/rename/{remote}", name="project_renameremote")
- * @Method("GET")
- * @Template()
- * @ProjectAccess(grantType="MASTER")
- */
- public function renameAction(Request $request,$id,$remote){
-
-
- $defaultData = array('remoteName' => $remote);
- $renameRemoteForm = $this->createRenameRemoteForm($defaultData);
-
- return array_merge($this->viewVariables, array(
- 'remote_form' => $renameRemoteForm->createView(),
- 'branchName' => $this->branchName
- ));
-
- }
-
- /**
- * Changes the name of the remote repositiory in git for the local branch
- *
- * @Route("/rename/{remote}", name="project_remoteupdate")
- * @Method("POST")
- * @Template("VersionControlGitControlBundle:ProjectRemote:rename.html.twig")
- * @ProjectAccess(grantType="MASTER")
- */
- public function updateAction(Request $request,$id){
-
- $renameRemoteForm = $this->createRenameRemoteForm();
-
- $renameRemoteForm->handleRequest($request);
-
- if ($renameRemoteForm->isValid()) {
- $data = $renameRemoteForm->getData();
- $remoteName = $data['remoteName'];
- $newRemoteName = $data['newRemoteName'];
-
- try{
- $response = $this->gitSyncCommands->renameRemote($remoteName,$newRemoteName);
- $this->get('session')->getFlashBag()->add('notice',$response);
- }catch (\Exception $e) {
- $this->get('session')->getFlashBag()->add('error', $e->getMessage());
- }
-
- return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
- }
-
-
- return array_merge($this->viewVariables, array(
- 'remote_form' => $renameRemoteForm->createView(),
- 'branchName' => $this->branchName
- ));
-
- }
-
-
-
- /**
- *
- * @param integer $id
- */
- public function initAction($id, $grantType = 'VIEW'){
-
- $redirectUrl = parent::initAction($id,$grantType);
- if($redirectUrl){
- return $redirectUrl;
- }
- $this->gitSyncCommands = $this->gitCommands->command('sync');
-
- }
-
-
- private function createRemoteForm(){
- $defaultData = array();
-
- $form = $this->createFormBuilder($defaultData, array(
- 'action' => $this->generateUrl('project_createremote', array('id' => $this->project->getId())),
- 'method' => 'POST',
- ))
- ->add('remoteName', 'text', array(
- 'label' => 'Remote Name'
- ,'required' => false
- ,'constraints' => array(
- new NotBlank()
- ))
- )
- ->add('remoteUrl', 'text', array(
- 'label' => 'Remote Url'
- ,'required' => false
- ,'constraints' => array(
- new NotBlank()
- ))
- )->add('submit', 'submit', array('label' => 'Add'))
-
- ->getForm();
-
- return $form;
- }
-
- private function createRenameRemoteForm($defaultData = array()){
-
-
- $form = $this->createFormBuilder($defaultData, array(
- 'action' => $this->generateUrl('project_createremote', array('id' => $this->project->getId())),
- 'method' => 'POST',
- ))
- ->add('remoteName', 'hidden', array(
- 'constraints' => array(
- new NotBlank()
- ))
- )
- ->add('newRemoteName', 'text', array(
- 'label' => 'New Remote Name'
- ,'required' => false
- ,'constraints' => array(
- new NotBlank()
- ))
- )->add('submit', 'submit', array('label' => 'Rename'))
-
- ->getForm();
-
- return $form;
- }
-
-}
diff --git a/src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php b/src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php
deleted file mode 100644
index 4613ba8..0000000
--- a/src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- */
-class AES256Encryptor implements EncryptorInterface {
-
- /**
- * Secret key for aes algorythm
- * @var string
- */
- private $secretKey;
-
- /**
- * Initialization of encryptor
- * @param string $key
- */
- public function __construct($key) {
- $this->secretKey = $key;
- }
-
- /**
- * Implementation of EncryptorInterface encrypt method
- * @param string $data
- * @return string
- */
- public function encrypt($data) {
-
- if(is_null($data) || trim($data) == ''){
- return $data;
- }
-
- return trim(base64_encode(mcrypt_encrypt(
- MCRYPT_RIJNDAEL_256, $this->secretKey, $data, MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND
- ))));
- }
-
- /**
- * Implementation of EncryptorInterface decrypt method
- * @param string $data
- * @return string
- */
- function decrypt($data) {
- if(is_null($data) || trim($data) == ''){
- return $data;
- }
- return trim(mcrypt_decrypt(
- MCRYPT_RIJNDAEL_256, $this->secretKey, base64_decode($data), MCRYPT_MODE_ECB, mcrypt_create_iv(
- mcrypt_get_iv_size(
- MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB
- ), MCRYPT_RAND
- )));
- }
-
-}
\ No newline at end of file
diff --git a/src/VersionControl/GitControlBundle/EventListener/GitAlterFilesEventListener.php b/src/VersionControl/GitControlBundle/EventListener/GitAlterFilesEventListener.php
deleted file mode 100644
index 8535532..0000000
--- a/src/VersionControl/GitControlBundle/EventListener/GitAlterFilesEventListener.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\EventListener;
-
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use VersionControl\GitCommandBundle\Event\GitAlterFilesEvent;
-use VersionControl\GitCommandBundle\GitCommands\GitCommand;
-
-
-class GitAlterFilesEventListener
-{
- /**
- *
- * @var VersionControl\GitCommandBundle\GitCommands\GitCommands\Command\GitFilesCommand
- */
- protected $gitCommand;
-
-
- public function __construct(GitCommand $gitCommand) {
- $this->gitCommand = $gitCommand;
- }
-
- public function changeFilePermissions(GitAlterFilesEvent $event)
- {
- $projectEnvironment = $event->getGitEnvironment();
- if(!$projectEnvironment instanceof \VersionControl\GitControlBundle\Entity\ProjectEnvironment){
- throw new \Exception('Git Environment must be a entity of project Environment');
- }
- $projectEnvironmentFilePerm = $projectEnvironment->getProjectEnvironmentFilePerm();
- if($projectEnvironmentFilePerm !== null){
- if($projectEnvironmentFilePerm->getEnableFilePermissions()){
-
- $gitFilesCommand = $this->gitCommand->command('files');
- $gitFilesCommand->overRideGitEnvironment($projectEnvironment);
-
- $branch = $this->gitCommand->command('branch')->getCurrentBranch();
-
- $files = array();
- if(count($event->getFilesAltered()) > 0){
- $files = $event->getFilesAltered();
- }else{
- $fileInfos = $gitFilesCommand->listFiles('',$branch,true);
-
- foreach($fileInfos as $fileInfo){
- $files[] =$fileInfo->getFullPath();
- }
- }
-
- $gitFilesCommand->setFilesPermissions($files
- ,$projectEnvironmentFilePerm->getFileMode()
- );
- $gitFilesCommand->setFilesOwnerAndGroup($files,$projectEnvironmentFilePerm->getFileOwner(),$projectEnvironmentFilePerm->getFileGroup());
- }
- }
- }
-
-}
-
diff --git a/src/VersionControl/GitControlBundle/Installer/dbscript/schema.sql b/src/VersionControl/GitControlBundle/Installer/dbscript/schema.sql
deleted file mode 100644
index e793671..0000000
--- a/src/VersionControl/GitControlBundle/Installer/dbscript/schema.sql
+++ /dev/null
@@ -1,477 +0,0 @@
--- Version Contorl SQL Structure
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
---
--- Database: 'version-control2'
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'acl_classes'
---
-
-CREATE TABLE IF NOT EXISTS acl_classes (
- id int(10) unsigned NOT NULL AUTO_INCREMENT,
- class_type varchar(200) COLLATE utf8_unicode_ci NOT NULL,
- PRIMARY KEY (id),
- UNIQUE KEY UNIQ_69DD750638A36066 (class_type)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'acl_entries'
---
-
-CREATE TABLE IF NOT EXISTS acl_entries (
- id int(10) unsigned NOT NULL AUTO_INCREMENT,
- class_id int(10) unsigned NOT NULL,
- object_identity_id int(10) unsigned DEFAULT NULL,
- security_identity_id int(10) unsigned NOT NULL,
- field_name varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
- ace_order smallint(5) unsigned NOT NULL,
- mask int(11) NOT NULL,
- granting tinyint(1) NOT NULL,
- granting_strategy varchar(30) COLLATE utf8_unicode_ci NOT NULL,
- audit_success tinyint(1) NOT NULL,
- audit_failure tinyint(1) NOT NULL,
- PRIMARY KEY (id),
- UNIQUE KEY UNIQ_46C8B806EA000B103D9AB4A64DEF17BCE4289BF4 (class_id,object_identity_id,field_name,ace_order),
- KEY IDX_46C8B806EA000B103D9AB4A6DF9183C9 (class_id,object_identity_id,security_identity_id),
- KEY IDX_46C8B806EA000B10 (class_id),
- KEY IDX_46C8B8063D9AB4A6 (object_identity_id),
- KEY IDX_46C8B806DF9183C9 (security_identity_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'acl_object_identities'
---
-
-CREATE TABLE IF NOT EXISTS acl_object_identities (
- id int(10) unsigned NOT NULL AUTO_INCREMENT,
- parent_object_identity_id int(10) unsigned DEFAULT NULL,
- class_id int(10) unsigned NOT NULL,
- object_identifier varchar(100) COLLATE utf8_unicode_ci NOT NULL,
- entries_inheriting tinyint(1) NOT NULL,
- PRIMARY KEY (id),
- UNIQUE KEY UNIQ_9407E5494B12AD6EA000B10 (object_identifier,class_id),
- KEY IDX_9407E54977FA751A (parent_object_identity_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'acl_object_identity_ancestors'
---
-
-CREATE TABLE IF NOT EXISTS acl_object_identity_ancestors (
- object_identity_id int(10) unsigned NOT NULL,
- ancestor_id int(10) unsigned NOT NULL,
- PRIMARY KEY (object_identity_id,ancestor_id),
- KEY IDX_825DE2993D9AB4A6 (object_identity_id),
- KEY IDX_825DE299C671CEA1 (ancestor_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'acl_security_identities'
---
-
-CREATE TABLE IF NOT EXISTS acl_security_identities (
- id int(10) unsigned NOT NULL AUTO_INCREMENT,
- identifier varchar(200) COLLATE utf8_unicode_ci NOT NULL,
- username tinyint(1) NOT NULL,
- PRIMARY KEY (id),
- UNIQUE KEY UNIQ_8835EE78772E836AF85E0677 (identifier,username)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'issue'
---
-
-CREATE TABLE IF NOT EXISTS issue (
- id int(11) NOT NULL AUTO_INCREMENT,
- title varchar(255) DEFAULT NULL,
- description longtext,
- `status` varchar(45) DEFAULT NULL,
- closed_at datetime DEFAULT NULL,
- created_at datetime DEFAULT NULL,
- updated_at datetime DEFAULT NULL,
- github_number int(11) DEFAULT NULL,
- ver_user_id int(11) NOT NULL,
- project_id int(11) NOT NULL,
- issue_milestone_id int(11) DEFAULT NULL,
- PRIMARY KEY (id),
- KEY fk_issue_ver_user1_idx (ver_user_id),
- KEY fk_issue_project1_idx (project_id),
- KEY fk_issue_issue_milestone1_idx (issue_milestone_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'issue_comment'
---
-
-CREATE TABLE IF NOT EXISTS issue_comment (
- id int(11) NOT NULL AUTO_INCREMENT,
- `comment` longtext,
- created_at datetime DEFAULT NULL,
- updated_at datetime DEFAULT NULL,
- ver_user_id int(11) DEFAULT NULL,
- issue_id int(11) NOT NULL,
- PRIMARY KEY (id),
- KEY fk_issue_comment_ver_user1_idx (ver_user_id),
- KEY fk_issue_comment_issue1_idx (issue_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'issue_event'
---
-
-CREATE TABLE IF NOT EXISTS issue_event (
- id int(11) NOT NULL AUTO_INCREMENT,
- commit_id varchar(255) DEFAULT NULL,
- `event` varchar(80) DEFAULT NULL COMMENT 'closed\nreopened\nreferenced\nmentioned\nassigned\nunassigned\nlabeled\nunlabeled\nmilestoned\ndemilestoned\nrenamed',
- created_at datetime DEFAULT NULL,
- issue_id int(11) NOT NULL,
- issue_milestone_id int(11) NOT NULL,
- issue_label_id int(11) NOT NULL,
- ver_user_id int(11) NOT NULL,
- assignee int(11) NOT NULL,
- PRIMARY KEY (id),
- KEY fk_issue_event_issue1_idx (issue_id),
- KEY fk_issue_event_issue_milestone1_idx (issue_milestone_id),
- KEY fk_issue_event_issue_label1_idx (issue_label_id),
- KEY fk_issue_event_ver_user1_idx (ver_user_id),
- KEY fk_issue_event_ver_user2_idx (assignee)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'issue_has_issue_label'
---
-
-CREATE TABLE IF NOT EXISTS issue_has_issue_label (
- issue_id int(11) NOT NULL,
- issue_label_id int(11) NOT NULL,
- PRIMARY KEY (issue_id,issue_label_id),
- KEY fk_issue_has_issue_label_issue_label1_idx (issue_label_id),
- KEY fk_issue_has_issue_label_issue1_idx (issue_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'issue_label'
---
-
-CREATE TABLE IF NOT EXISTS issue_label (
- id int(11) NOT NULL AUTO_INCREMENT,
- title varchar(80) DEFAULT NULL,
- hex_color varchar(80) DEFAULT NULL,
- all_projects tinyint(1) DEFAULT '0',
- project_id int(11) DEFAULT NULL,
- PRIMARY KEY (id),
- KEY fk_issue_label_project1_idx (project_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'issue_milestone'
---
-
-CREATE TABLE IF NOT EXISTS issue_milestone (
- id int(11) NOT NULL AUTO_INCREMENT,
- title varchar(255) DEFAULT NULL,
- description longtext,
- state varchar(45) DEFAULT NULL,
- due_on datetime DEFAULT NULL,
- created_at datetime DEFAULT NULL,
- updated_at datetime DEFAULT NULL,
- closed_at datetime DEFAULT NULL,
- ver_user_id int(11) NOT NULL,
- project_id int(11) NOT NULL,
- PRIMARY KEY (id),
- KEY fk_issue_milestone_ver_user1_idx (ver_user_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'project'
---
-
-CREATE TABLE IF NOT EXISTS project (
- id int(11) NOT NULL AUTO_INCREMENT,
- title varchar(80) NOT NULL,
- description varchar(225) DEFAULT NULL,
- path varchar(225) DEFAULT NULL,
- ssh tinyint(1) DEFAULT NULL,
- `host` varchar(225) DEFAULT NULL,
- username varchar(225) DEFAULT NULL,
- `password` longtext,
- key_file varchar(225) DEFAULT NULL,
- creator_id int(11) NOT NULL,
- PRIMARY KEY (id),
- KEY fk_project_ver_user_idx (creator_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'project_environment'
---
-
-CREATE TABLE IF NOT EXISTS project_environment (
- id int(11) NOT NULL AUTO_INCREMENT,
- title varchar(80) DEFAULT NULL,
- description varchar(225) DEFAULT NULL,
- path varchar(225) DEFAULT NULL,
- ssh tinyint(1) DEFAULT NULL,
- `host` varchar(225) DEFAULT NULL,
- username varchar(225) DEFAULT NULL,
- `password` longtext,
- key_file varchar(225) DEFAULT NULL,
- project_id int(11) NOT NULL,
- project_environment_file_perm_id int(11) DEFAULT NULL,
- private_key longtext,
- private_key_password longtext,
- PRIMARY KEY (id),
- KEY fk_project_environment_project1_idx (project_id),
- KEY fk_project_environment_project_environment_file_perm1_idx (project_environment_file_perm_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'project_environment_file_perm'
---
-
-CREATE TABLE IF NOT EXISTS project_environment_file_perm (
- id int(11) NOT NULL AUTO_INCREMENT,
- file_owner varchar(80) DEFAULT NULL,
- file_group varchar(80) DEFAULT NULL,
- permission_owner_read tinyint(1) DEFAULT NULL,
- permission_owner_write tinyint(1) DEFAULT NULL,
- permission_owner_execute tinyint(1) DEFAULT NULL,
- permission_sticky_uid tinyint(1) DEFAULT NULL,
- permission_group_read tinyint(1) DEFAULT NULL,
- permission_group_write tinyint(1) DEFAULT NULL,
- permission_group_execute tinyint(1) DEFAULT NULL,
- permission_sticky_gid tinyint(1) DEFAULT NULL,
- permission_other_read tinyint(1) DEFAULT NULL,
- permission_other_write tinyint(1) DEFAULT NULL,
- permission_other_execute tinyint(1) DEFAULT NULL,
- permission_sticky_bit tinyint(1) DEFAULT NULL,
- enable_file_permissions tinyint(1) DEFAULT NULL,
- PRIMARY KEY (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'project_issue_integrator'
---
-
-CREATE TABLE IF NOT EXISTS project_issue_integrator (
- id int(11) NOT NULL AUTO_INCREMENT,
- project_id int(11) NOT NULL,
- repo_type varchar(80) DEFAULT NULL,
- class_name varchar(255) DEFAULT NULL,
- PRIMARY KEY (id),
- KEY fk_project_issue_integrator_project1_idx (project_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'project_issue_integrator_github'
---
-
-CREATE TABLE IF NOT EXISTS project_issue_integrator_github (
- id int(11) NOT NULL AUTO_INCREMENT,
- repo_name varchar(255) DEFAULT NULL,
- owner_name varchar(255) DEFAULT NULL,
- api_token varchar(255) DEFAULT NULL,
- PRIMARY KEY (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'project_issue_integrator_gitlab'
---
-
-CREATE TABLE IF NOT EXISTS project_issue_integrator_gitlab (
- id int(11) NOT NULL AUTO_INCREMENT,
- project_name varchar(255) DEFAULT NULL,
- url varchar(255) DEFAULT NULL,
- api_token varchar(255) DEFAULT NULL,
- PRIMARY KEY (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'user_projects'
---
-
-CREATE TABLE IF NOT EXISTS user_projects (
- id int(11) NOT NULL AUTO_INCREMENT,
- roles varchar(225) DEFAULT NULL,
- project_id int(11) NOT NULL,
- ver_user_id int(11) NOT NULL,
- PRIMARY KEY (id),
- KEY fk_table1_project1_idx (project_id),
- KEY fk_table1_ver_user1_idx (ver_user_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table 'ver_user'
---
-
-CREATE TABLE IF NOT EXISTS ver_user (
- id int(11) NOT NULL AUTO_INCREMENT,
- username varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
- username_canonical varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
- email varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
- email_canonical varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
- enabled tinyint(1) NOT NULL,
- salt varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
- `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
- last_login datetime DEFAULT NULL,
- locked tinyint(1) NOT NULL,
- expired tinyint(1) NOT NULL,
- expires_at datetime DEFAULT NULL,
- confirmation_token varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
- password_requested_at datetime DEFAULT NULL,
- roles longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '(DC2Type:array)',
- credentials_expired tinyint(1) NOT NULL,
- credentials_expire_at datetime DEFAULT NULL,
- `name` varchar(255) DEFAULT NULL,
- github_id varchar(255) DEFAULT NULL,
- github_access_token varchar(255) DEFAULT NULL,
- PRIMARY KEY (id),
- UNIQUE KEY UNIQ_86EDD9B992FC23A8 (username_canonical),
- UNIQUE KEY UNIQ_86EDD9B9A0D96FBF (email_canonical)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Constraints for dumped tables
---
-
---
--- Constraints for table acl_entries
---
-ALTER TABLE acl_entries
- ADD CONSTRAINT FK_46C8B8063D9AB4A6 FOREIGN KEY (object_identity_id) REFERENCES acl_object_identities (id) ON DELETE CASCADE ON UPDATE CASCADE,
- ADD CONSTRAINT FK_46C8B806DF9183C9 FOREIGN KEY (security_identity_id) REFERENCES acl_security_identities (id) ON DELETE CASCADE ON UPDATE CASCADE,
- ADD CONSTRAINT FK_46C8B806EA000B10 FOREIGN KEY (class_id) REFERENCES acl_classes (id) ON DELETE CASCADE ON UPDATE CASCADE;
-
---
--- Constraints for table acl_object_identities
---
-ALTER TABLE acl_object_identities
- ADD CONSTRAINT FK_9407E54977FA751A FOREIGN KEY (parent_object_identity_id) REFERENCES acl_object_identities (id);
-
---
--- Constraints for table acl_object_identity_ancestors
---
-ALTER TABLE acl_object_identity_ancestors
- ADD CONSTRAINT FK_825DE2993D9AB4A6 FOREIGN KEY (object_identity_id) REFERENCES acl_object_identities (id) ON DELETE CASCADE ON UPDATE CASCADE,
- ADD CONSTRAINT FK_825DE299C671CEA1 FOREIGN KEY (ancestor_id) REFERENCES acl_object_identities (id) ON DELETE CASCADE ON UPDATE CASCADE;
-
---
--- Constraints for table issue
---
-ALTER TABLE issue
- ADD CONSTRAINT fk_issue_issue_milestone1 FOREIGN KEY (issue_milestone_id) REFERENCES issue_milestone (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_project1 FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_ver_user1 FOREIGN KEY (ver_user_id) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
---
--- Constraints for table issue_comment
---
-ALTER TABLE issue_comment
- ADD CONSTRAINT fk_issue_comment_issue1 FOREIGN KEY (issue_id) REFERENCES issue (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_comment_ver_user1 FOREIGN KEY (ver_user_id) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
---
--- Constraints for table issue_event
---
-ALTER TABLE issue_event
- ADD CONSTRAINT fk_issue_event_issue1 FOREIGN KEY (issue_id) REFERENCES issue (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_event_issue_label1 FOREIGN KEY (issue_label_id) REFERENCES issue_label (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_event_issue_milestone1 FOREIGN KEY (issue_milestone_id) REFERENCES issue_milestone (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_event_ver_user1 FOREIGN KEY (ver_user_id) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_event_ver_user2 FOREIGN KEY (assignee) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
---
--- Constraints for table issue_has_issue_label
---
-ALTER TABLE issue_has_issue_label
- ADD CONSTRAINT fk_issue_has_issue_label_issue1 FOREIGN KEY (issue_id) REFERENCES issue (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_issue_has_issue_label_issue_label1 FOREIGN KEY (issue_label_id) REFERENCES issue_label (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
---
--- Constraints for table issue_label
---
-ALTER TABLE issue_label
- ADD CONSTRAINT fk_issue_label_project1 FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE SET NULL ON UPDATE NO ACTION;
-
---
--- Constraints for table issue_milestone
---
-ALTER TABLE issue_milestone
- ADD CONSTRAINT fk_issue_milestone_ver_user1 FOREIGN KEY (ver_user_id) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
---
--- Constraints for table project
---
-ALTER TABLE project
- ADD CONSTRAINT fk_project_ver_user FOREIGN KEY (creator_id) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
---
--- Constraints for table project_environment
---
-ALTER TABLE project_environment
- ADD CONSTRAINT fk_project_environment_project1 FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_project_environment_project_environment_file_perm1 FOREIGN KEY (project_environment_file_perm_id) REFERENCES project_environment_file_perm (id) ON DELETE CASCADE ON UPDATE NO ACTION;
-
---
--- Constraints for table project_issue_integrator
---
-ALTER TABLE project_issue_integrator
- ADD CONSTRAINT fk_project_issue_integrator_project1 FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE CASCADE ON UPDATE NO ACTION;
-
---
--- Constraints for table user_projects
---
-ALTER TABLE user_projects
- ADD CONSTRAINT fk_table1_project1 FOREIGN KEY (project_id) REFERENCES project (id) ON DELETE NO ACTION ON UPDATE NO ACTION,
- ADD CONSTRAINT fk_table1_ver_user1 FOREIGN KEY (ver_user_id) REFERENCES ver_user (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/src/VersionControl/GitControlBundle/Repository/IssueRepository.php b/src/VersionControl/GitControlBundle/Repository/IssueRepository.php
deleted file mode 100644
index 3a1a77c..0000000
--- a/src/VersionControl/GitControlBundle/Repository/IssueRepository.php
+++ /dev/null
@@ -1,252 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Repository;
-
-use Doctrine\ORM\EntityRepository;
-use VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryInterface;
-use VersionControl\GitControlBundle\Entity\Issue;
-use VersionControl\GitControlBundle\Entity\IssueComment;
-
-class IssueRepository extends EntityRepository implements IssueRepositoryInterface
-{
-
-
- protected $project;
-
- protected $currentUser;
-
-
- /**
- * Finds issues for a state
- * @param string $keyword
- * @return array of issues
- */
- public function findIssues($keyword,$state="open"){
-
- return $this->findByProjectAndStatus($state,$keyword,null,true);
-
- }
-
- /**
- * Finds issues for a state
- * @param string $keyword
- * @return array of issues
- */
- public function countFindIssues($keyword,$state="open"){
- return $this->countIssuesForProjectWithStatus($state,$keyword);
- }
-
- /**
- *
- * @param integer $id
- */
- public function findIssueById($id){
-
- $issueEntity = $this->find($id);
-
- if (!$issueEntity) {
- throw $this->createNotFoundException('Unable to find Issue entity.');
- }
-
- return $issueEntity;
- }
-
- /**
- *
- * @param type $issue
- */
- public function newIssue(){
- $issueEntity = new Issue();
- $issueEntity->setProject($this->project);
- return $issueEntity;
- }
-
- /**
- *
- * @param type $issue
- */
- public function newIssueComment(){
- $issueComment = new IssueComment();
- //$issueComment->setProject($this->project);
- return $issueComment;
- }
-
- public function createIssueComment($issueComment){
- $em=$this->getEntityManager();
-
- //Set User
- $issueComment->setVerUser($this->currentUser);
- $em->persist($issueComment);
- $em->flush();
-
- return $issueComment;
- }
-
- /**
- *
- * @param type $issueEntity
- */
- public function createIssue($issueEntity){
- $em=$this->getEntityManager();
- $issueEntity->setProject($this->project);
-
- //Set User
- $issueEntity->setVerUser($this->currentUser);
-
- $em->persist($issueEntity);
- $em->flush();
-
- return $issueEntity;
- }
-
- /**
- *
- * @param integer $id
- */
- public function reOpenIssue($id){
- $issueEntity = $this->find($id);
- if($issueEntity){
- $issueEntity->setOpen();
-
- $em=$this->getEntityManager();
- $em->flush();
- }
- return $issueEntity;
- }
-
- /**
- *
- * @param integer $id
- */
- public function closeIssue($id){
- $issueEntity = $this->find($id);
- if($issueEntity){
- $issueEntity->setClosed();
-
- $em=$this->getEntityManager();
- $em->flush();
- }
- return $issueEntity;
- }
-
- /**
- *
- * @param integer $issue
- */
- public function updateIssue($issueEntity){
- $em=$this->getEntityManager();
-
- $em->flush();
- }
-
- /**
- * Gets the number of Issues for a milestone by state
- * @param integer $issueMilestoneId
- * @param string $state open|closed|blank
- */
- public function countIssuesInMilestones($issueMilestoneId,$state){
- return $this->countIssuesForProjectWithStatus($state,false,$issueMilestoneId);
- }
-
- /**
- * Find issues in milestone
- *
- * @param integer $issueMilestoneId
- * @param string $state open|closed|blank
- * @param string $keyword Search string
- */
- public function findIssuesInMilestones($issueMilestoneId,$state,$keyword = false){
- return $this->findByProjectAndStatus($state,$keyword,$issueMilestoneId,true);
- }
-
- /**
- *
- * @param type $project
- * @return integer
- */
- public function countIssuesForProjectWithStatus($status = 'open',$keyword=false,$milestone=null)
- {
-
- $qb = $this->findByProjectAndStatus($status,$keyword,$milestone,true);
-
- $qb->select('count(a)');
-
- return $qb->getQuery()->getSingleScalarResult();
-
- }
-
- public function findByProjectAndStatus($status = 'open',$keyword = false,$milestone=null,$queryOnly= false){
- $em=$this->getEntityManager();
- $qb = $em->createQueryBuilder();
-
- $where = 'a.project = :project';
- $parameters = array('project'=>$this->project);
-
-
- $qb->select('a')
- ->from('VersionControlGitControlBundle:Issue','a')
- ->where($where)
- ->setParameters($parameters);
-
- if($status){
- $qb->andWhere(
- $qb->expr()->like('a.status', ':status')
- )->setParameter('status', $status);
- }
- //If keyword is set
- if($keyword){
- $qb->andWhere(
- $qb->expr()->orX(
- $qb->expr()->like('a.title', ':keyword'),
- $qb->expr()->like('a.description', ':keyword')
- )
- )->setParameter('keyword', '%'.$keyword.'%');
- }
-
- if($milestone != null){
- $qb->andWhere(
- $qb->expr()->eq('a.issueMilestone', ':milestone')
- )->setParameter('milestone', $milestone);
- }
-
- $qb->orderBy('a.updatedAt','desc');
-
- if($queryOnly === true){
- return $qb;
- }else{
- return $qb->getQuery()->getResult();
- }
-
- }
-
- public function getProject() {
- return $this->project;
- }
-
- public function setProject($project) {
- $this->project = $project;
- return $this;
- }
-
- public function getCurrentUser() {
- return $this->currentUser;
- }
-
- public function setCurrentUser($currentUser) {
- $this->currentUser = $currentUser;
- return $this;
- }
-
-
-
-
-
-}
-?>
\ No newline at end of file
diff --git a/src/VersionControl/GitControlBundle/Repository/ProjectRepository.php b/src/VersionControl/GitControlBundle/Repository/ProjectRepository.php
deleted file mode 100644
index 6d76d6f..0000000
--- a/src/VersionControl/GitControlBundle/Repository/ProjectRepository.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace VersionControl\GitControlBundle\Repository;
-
-use Doctrine\ORM\EntityRepository;
-
-class ProjectRepository extends EntityRepository
-{
-
- public function findByKeyword($keyword = false,$queryOnly= false){
- $em=$this->getEntityManager();
- $qb = $em->createQueryBuilder();
-
-
- $qb->select('a')
- ->from('VersionControlGitControlBundle:Project','a');
-
-
- //If keyword is set
- if($keyword){
- $qb->andWhere('a.title LIKE :keyword OR a.title LIKE :keyword')
- ->setParameter('keyword', '%'.$keyword.'%');
- }
-
- if($queryOnly === true){
- return $qb;
- }else{
- return $qb->getQuery()->getResult();
- }
-
- }
-}
diff --git a/src/VersionControl/GitControlBundle/Resources/config/gitservices.yml b/src/VersionControl/GitControlBundle/Resources/config/gitservices.yml
deleted file mode 100644
index f97ce7d..0000000
--- a/src/VersionControl/GitControlBundle/Resources/config/gitservices.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-services:
- version_control.ssh_process:
- class: VersionControl\GitControlBundle\Utility\SshProcess
-
- version_control.git_commands:
- class: VersionControl\GitControlBundle\Utility\GitCommands\GitCommand
- calls:
- - [setSecurityContext, ["@security.token_storage"]]
- - [setProjectEnvironmentStorage, ["@version_control.project_environmnent_storage"]]
- - [setDispatcher, ["@event_dispatcher"]]
- - [setLogger, ["@version_control.logger"]]
- - [setSshProcess, ["@version_control.ssh_process"]]
-
- version_control.gitcommand_collector:
- class: VersionControl\GitControlBundle\Profiler\GitCommandCollector
- tags:
- -
- name: data_collector
- template: 'VersionControlGitControlBundle:Profiler:GitCommand.html.twig'
- id: 'version_control.gitcommand_collector'
- #priority: 300
- public: false
- arguments:
- - @version_control.logger
-
-
- version_control.logger:
- class: VersionControl\GitControlBundle\Logger\GitCommandLogger
- arguments:
- - @logger
- - %kernel.debug%
- tags:
- - { name: monolog.logger, channel: 'gitcommand' }
-
- version_control.issue_repository_manager:
- class: VersionControl\GitControlBundle\Repository\Issues\IssueRepositoryManager
- arguments:
- - @security.token_storage
- - @doctrine.orm.entity_manager
- - @service_container
-
\ No newline at end of file
diff --git a/src/VersionControl/GitControlBundle/Resources/views/Project/edit.html.twig b/src/VersionControl/GitControlBundle/Resources/views/Project/edit.html.twig
deleted file mode 100644
index 251c991..0000000
--- a/src/VersionControl/GitControlBundle/Resources/views/Project/edit.html.twig
+++ /dev/null
@@ -1,202 +0,0 @@
-{% form_theme edit_form 'VersionControlGitControlBundle::FormTheme/_editproject-prototype.html.twig' %}
-{% extends "VersionControlGitControlBundle::admin.layout.html.twig" %}
-
-
-{% block topnavleft %}
-
-{% endblock %}
-
-{% block header %}
-
-
-
-
-
-
-
-
-{% endblock %}
-
-{% block sidemenu -%}
- {% include 'VersionControlGitControlBundle::Partials/modifiySideMenu.html.twig' %}
-{% endblock %}
-
-
-{% block content -%}
-
-
-
-
-
-
-
- {{ form_start(edit_form,{ 'attr': { 'class': 'form'}}) }}
-
- {{ form_errors(edit_form) }}
-
- {{ form_label(edit_form.title) }}
- {{ form_errors(edit_form.title) }}
- {{ form_widget(edit_form.title,{ 'attr': { 'class': 'form-control', 'placeholder':'Please provide a name for your project'}}) }}
-
-
- {{ form_label(edit_form.description) }}
- {{ form_errors(edit_form.description) }}
- {{ form_widget(edit_form.description,{ 'attr': { 'class': 'form-control', 'placeholder':'Please provide a description of the project'}}) }}
-
-
-
-
- Cancel
-
- {{ form_widget(edit_form.submit, { 'attr': {'class': 'btn btn-success'} }) }}
-
- {{ form_end(edit_form) }}
-
Project Environments
-
-
-
- {#
- {% set user = app.security.getToken().getUser() %}
- {% if(user.githubId) %}
-
-
-
Connect
-
-
-
You are already connected to a Github Account
-
-
- {% else %}
-
- {% endif %}
- #}
-
-
-
-
-
-
-
You can edit the projects title and description in the form and manage your "Project Environments".
- When creating a new Project Environment you have 3 Options:
-
- Existing: References a folder which already contains a git repository
- New: References a folder that DOESN't contain a git repository and initalize a new one
- Clone: References a folder that DOESN't contain a git repository and clones a git repository into this folder.
-
-
-
-
-
-
-
-
-
-
-
-{% endblock %}
-
-{% block sidemenu -%}
- {% include 'VersionControlGitControlBundle::Partials/sidemenu.html.twig' %}
-{% endblock %}
-
-{% block content -%}
-
-
-
-
-
-
-
- {% if(files|length > 0)%}
- {{ form_start(commit_form,{ 'attr': { 'class': 'form', 'data-masklabel': 'Committing Files...'}}) }}
- {{ form_errors(commit_form) }}
-
- {% if(files|length > 200)%}
-
-
To many files to List!
-
-
There are over {{files|length}} files to commit. This is to many to list. Select "Commit all files" to commit all the files
-
- {{ form_label(commit_form.files) }}
- {{ form_errors(commit_form.files) }}
- {{ form_widget(commit_form.files,{ 'attr': { 'class': ''}}) }}
- {% else %}
- {{ form_label(commit_form.files) }}
- {{ form_errors(commit_form.files) }}
- {{ form_widget(commit_form.files,{ 'attr': { 'class': 'commit-file'}, 'project':project}) }}
-
-
- Select All
- Deselect All
-
- {% endif %}
-
- {{ form_label(commit_form.comment) }}
- {{ form_errors(commit_form.comment) }}
- {{ form_widget(commit_form.comment,{ 'attr': { 'class': 'form-control', 'placeholder':'Enter a commit message here'}}) }}
-
-
-
- {% if(commit_form.pushRemote is defined)%}
-
- {{ form_label(commit_form.pushRemote) }}
- {{ form_errors(commit_form.pushRemote) }}
- {{ form_widget(commit_form.pushRemote) }}
-
-
- {% endif %}
- {% if(issueCount > 0) %}
-
-
-
- Issue Options
-
-
-
-
- {{ form_label(commit_form.issue) }}
- {{ form_errors(commit_form.issue) }}
- {{ form_widget(commit_form.issue,{ 'attr': { 'class': 'form-control issue-select'}}) }}
-
-
-
- {{ form_label(commit_form.issueAction) }}
- {{ form_errors(commit_form.issueAction) }}
- {{ form_widget(commit_form.issueAction) }}
-
-
-
- {% endif %}
-
-
Cancel
- {{ form_widget(commit_form.submit, { 'attr': {'class': ' btn-success submit','data-loading-text':'Committing...'} }) }}
-
-
- {{ form_end(commit_form) }}
-
- {% else %}
-
There is nothing to commit in this branch
- {% endif %}
-
-
-
-
-
-
-
-
-
-{% endblock %}
-
-{% block sidemenu -%}
- {% include 'VersionControlGitControlBundle::Partials/sidemenu.html.twig' %}
-{% endblock %}
-
-{% block content -%}
-
-
-
-
-
-
-
- Files Added
- {{files.addedCount}}
-
-
-
-
-
-
-
-
-
-
-
- Files Modified
- {{files.modifiedCount}}
-
-
-
-
-
-
-
-
-
-
-
- Files Deleted
- {{files.deletedCount}}
-
-
-
-
-
-
-
-
-
-
-
- Files Copied
- {{files.copiedCount}}
-
-
-
-
-
-
-
-
-
-
-
- Files Renamed
- {{files.renamedCount}}
-
-
-
-
-
-
-
-
-
-
-
- Other
- {{files.otherStatusCount}}
-
-
-
-
-
-
-
-
-
-
-
- Status Change
- File
- Action
-
-
-
- {% for file in files %}
-
-
- {% if(file.statusChange == 'M') %}
- {{file.statusChange}}
- {% elseif(file.statusChange == 'A') %}
- {{file.statusChange}}
- {% elseif(file.statusChange == 'U') %}
- {{file.statusChange}}
- {% elseif(file.statusChange == 'D') %}
- {{file.statusChange}}
- {% elseif(file.statusChange == 'C') %}
- {{file.statusChange}}
- {% elseif(file.statusChange == '?') %}
- {{file.statusChange}}
- {% elseif(file.statusChange == '!') %}
- {{file.statusChange}}
- {% else %}
- {{file.statusChange}}
- {% endif %}
-
-
- {{file.filePath}}
-
-
-
- Checkout file
-
-
-
- {% endfor %}
-
-
-
- Status Change
- File
-
-
-
-
-
-
- */
-class PaginationExtension extends \Twig_Extension {
-
-
- protected $midRange = 5;
-
- protected $numPages = 0;
-
- protected $currentPage = 0;
-
- protected $pageIdentifier = 'page';
-
- private $generator;
-
- private $routeName;
-
- private $routeParameters;
-
- private $routeRelative;
-
- private $requestStack;
-
- public function __construct(UrlGeneratorInterface $generator, RequestStack $requestStack)
- {
- $this->generator = $generator;
- $this->requestStack = $requestStack;
- }
-
- /**
- * {@inheritDoc}
- */
- public function getName() {
- return 'lre_pagination';
- }
-
- /**
- * {@inheritDoc}
- */
- public function getFilters()
- {
- return array(
- new \Twig_SimpleFilter('pagination', array($this, 'paginationFilter')),
- );
- }
-
- /**
- * This will NOT remove any trailing dots, i.e. won't change "There must be something more...".
- * @param string $value Text possibly containing a trailing dot.
- * @return string Text with trailing dot added if there was none before.
- * @throws \InvalidArgumentException If {@code $value} is not a string.
- */
- public function paginationFilter($totalRecords, $currentPage, $recordsPerPage = 30, $routeName=false, $routeParameters = array(), $routeRelative = false) {
- $this->routeName = $routeName;
- $this->routeParameters = $routeParameters;
- $this->routeRelative = $routeRelative?(UrlGeneratorInterface::RELATIVE_PATH):UrlGeneratorInterface::ABSOLUTE_URL;
-
- if($totalRecords > 0){
- $this->numPages = ceil($totalRecords / $recordsPerPage);
- $this->currentPage = $currentPage;
- $content = 'prev next First Page '.$this->numPages.' '.$i.' '.$i.'
+ 
+ 
+ 
+ 
+ 
+