ProjectCommitController::fixConflictAction() - Code Metrics - SSHVersionControl/git-web-client - Measure and Improve Code Quality continuously with Scrutinizer

ProjectCommitController::fixConflictAction() A
last analyzed 2020-04-05 19:19 UTC

↳ Parent: ProjectCommitController
Complexity

Conditions	1
Paths	1
Size

Total Lines	6
Code Lines	3
Duplication

Lines	0
Ratio	0 %
Importance

Changes
Metric	Value
cc	1
eloc	3
c	0
b	0
f	0
nc	1
nop	1
dl	0
loc	6
rs	10
<?php
/*
 * This file is part of the GitControlBundle package.
 *
 * (c) Paul Schweppe <[email protected]>
 *
 * 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
filter:
    dependency_paths: ["lib/*"]
     */
    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)
    public function listAction(/** @scrutinizer ignore-unused */ $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)
    public function abortMergeAction(/** @scrutinizer ignore-unused */ $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)
    public function fileDiffAction(/** @scrutinizer ignore-unused */ $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
filter:
    dependency_paths: ["lib/*"]
     */
    public function filterConflicts($files,$conflictedFiles){
    public function filterConflicts($files,/** @scrutinizer ignore-unused */ $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,
        ));
    }
}

SSHVersionControl / git-web-client

ProjectCommitController::fixConflictAction() A last analyzed 2020-04-05 19:19 UTC

Complexity

Size

Duplication

Importance

Duplication Side-by-Side

Filter issues like

ProjectCommitController::fixConflictAction() A
last analyzed 2020-04-05 19:19 UTC
