Base::resolveMergeConflicts() - Code Metrics - Inspection of "NRFE-573: Bugfix: Made merge with squash-option se..." - netresearch/kite - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 096e0a...7c9715 )

unknown

created 2016-11-14 09:57 UTC

Base::resolveMergeConflicts() B

↳ Parent: Base

Complexity

Conditions	6
Paths	12

Size

Total Lines	22
Code Lines	15

Duplication

Lines	0
Ratio	0 %

Importance

Changes

Metric	Value
cc	6
eloc	15
nc	12
nop	1
dl	0
loc	22
rs	8.6737
c	0
b	0
f	0

<?php
/**
 * See class comment
 *
 * PHP Version 5
 *
 * @category   Netresearch
 * @package    Netresearch\Kite\Workflow
 * @subpackage Composer
 * @author     Christian Opitz <[email protected]>
 * @license    http://www.netresearch.de Netresearch Copyright
 * @link       http://www.netresearch.de
 */

namespace Netresearch\Kite\Workflow\Composer;
use Netresearch\Kite\Service\Composer\Package;
use Netresearch\Kite\Workflow;
use Netresearch\Kite\Exception;

/**
 * Abstract for composer workflows
 *
 * @category   Netresearch
 * @package    Netresearch\Kite\Workflow
 * @subpackage Composer
 * @author     Christian Opitz <[email protected]>
 * @license    http://www.netresearch.de Netresearch Copyright
 * @link       http://www.netresearch.de
 */
abstract class Base extends Workflow
{
    /**
     * @var Package[]
     */
    protected $pushPackages = array();

    /**
     * @var array
     */
    protected $whitelists;

    /**
     * @var array
     */
    protected $packageNames;

    /**
     * Configure the variables
     *
     * @return array
     */
    protected function configureVariables()
    {
        $config = $this->getParent()->get('config');
        if (!array_key_exists('composer', $config)) {
            $config['composer'] = [];
        }
        foreach (['whitelistNames', 'whitelistPaths', 'whitelistRemotes'] as $key) {
            if (!array_key_exists($key, $config['composer'])) {
                $config['composer'][ $key ] = null;
            }
        }

        return [
            'packages' => array(
                'type' => 'array',
                'label' => 'Package name(s) to limit this operation to',
                'shortcut' => 'p',
                'option' => true
            ),
            'whitelistNames' => array(
                'default' => '{config["composer"]["whitelistNames"]}',
                'type' => 'string',
                'label' => 'Regular expression for package names, to limit this operation to',
                'option' => true
            ),
            'whitelistPaths' => array(
                'default' => '{config["composer"]["whitelistPaths"]}',
                'type' => 'string',
                'label' => 'Regular expression for package paths, to limit this operation to',
                'option' => true
            ),
            'whitelistRemotes' => array(
                'default' => '{config["composer"]["whitelistRemotes"]}',
                'type' => 'string',
                'label' => 'Regular expression for package remote urls, to limit this operation to',
                'option' => true
            ),
            '--'
        ] + parent::configureVariables();
    }


    /**
     * Push all packages marked to be pushed
     *
     * @return void
     */
    protected function pushPackages()
    {
        foreach ($this->pushPackages as $i => $package) {
            $this->assertPackageIsWhiteListed($package);
            $this->console->output("Pushing <comment>$package->name</comment>", false);
            $this->git('push', $package->path, array('u' => 'origin', $package->branch));
            $this->console->output(
                str_repeat(chr(8), strlen($package->name))
                . '<info>' . $package->name . '</info>'
            );
            unset($this->pushPackages[ $i ]);
        }
    }

    /**
     * doComposerUpdateIfNecessary and possible
     *
     * @return void
     */
    protected function doComposerUpdate()
    {
        try {
            $this->composer('update');
        } catch (\Exception $e) {
            $this->console->output('<warning>Composer update failed</warning>');
            $this->console->output('<comment>This might have occured because previous pushes to git did not reache the composer repo yet</comment>');
            if ($this->confirm('Retry?')) {
                $this->doComposerUpdate();
            } else {
                $this->doExit('', 1);
            }
        }
    }

    /**
     * Go through all packages and check if packages requiring those packages,
     * still require their (likely new) versions.
     *
     * If not and $autoFix or user agrees, the require-statements in the
     * dependent packages are changed accordingly.
     *
     * @param Package[] $packages Packages
     * @param bool      $autoFix  Whether to autofix wrong requirements
     *
     * @return void
     */
    protected function rewriteRequirements(array &$packages, $autoFix = false)
    {
        $checkedOutPackages = array_keys($packages);
        $unfixedRequirements = 0;
        while ($packageName = array_shift($checkedOutPackages)) {
            $branch = $packages[ $packageName ]->branch;
            $version = 'dev-' . $branch;
            foreach ($this->getPackages(false, false) as $package) {
                if (array_key_exists($packageName, $package->requires)) {
                    // TODO: Set required version to branch alias, if any
                    $requiredVersion = $package->requires[ $packageName ];
                    if ($requiredVersion === '@dev') {
                        $requiredVersion = 'dev-master';
                    }
                    if ($requiredVersion !== $version) {
                        $this->assertPackageIsWhiteListed($package);
                        if (!$package->git) {
                            throw new Exception("Package {$package->name} required to be installed from source");
                        }
                        if ($autoFix) {
                            $fix = true;
                            $this->output("Changing required version of {$packageName} in {$package->name} from {$requiredVersion} to {$version}");
                        } else {
                            $this->output("<warning>{$package->name} depends on {$packageName} {$package->requires[$packageName]} and not {$version} as expected</warning>");
                            $this->output('<comment>If you don\'t fix that, the branches will probably change with composer update</comment>');
                            $fix = $this->confirm('Fix that?');
                        }
                        if ($fix) {
                            if ($this->checkoutPackage($package, $branch, true)) {
                                $checkedOutPackages[] = $package->name;
                            }
                            if (!array_key_exists($package->name, $packages)) {
                                $packages[ $package->name ] = $package;
                            }
                            $this->pushPackages[ $packageName ] = $packages[ $packageName ];
                            $this->rewriteRequirement($package, $packageName, $version);
                        } else {
                            $unfixedRequirements++;
                        }
                    }
                }
            }
        }
        if ($unfixedRequirements) {
            $this->doExit(
                'It seems like a composer update is required but due to probably incorrect dependencies you have to do that manually', 1
            );
        }
    }

    /**
     * Change the require statement for $requiredPackage to the newVersion in
     * $package
     *
     * @param Package $package         The package
     * @param string  $requiredPackage The required package
     * @param string  $newVersion      The new version
     *
     * @return void
     */
    protected function rewriteRequirement($package, $requiredPackage, $newVersion)
    {
        $this->assertPackageIsWhiteListed($package);

        $currentVersion = $package->requires[ $requiredPackage ];
        $composerFile = $package->path . '/composer.json';
        $composerFileContents = file_get_contents($composerFile);
        $newComposerFileContents = preg_replace(
            sprintf(
                '/(^\s*"require"\s*:\s*\{[^\}]+"%s"\s*:\s*")%s/m',
                preg_quote($requiredPackage, '/'),
                preg_quote($currentVersion, '/')
            ),
            '$1' . $newVersion,
            $composerFileContents
        );
        file_put_contents($composerFile, $newComposerFileContents);
        $package->reloadRequires();
        if ($package->requires[ $requiredPackage ] !== $newVersion) {
            file_put_contents($composerFile, $composerFileContents);
            $this->output('<error>Could not replace version</error> - generated composer.json was:');
            $this->output($newComposerFileContents);
            throw new Exception('Replacing version failed');
        }

        $this->git('commit', $package->path, array('n' => true, 'm' => "Change required version of $requiredPackage to $newVersion", 'composer.json'));
        if (!isset($package->source)) {
            $package->source = new \stdClass();
        }
        $package->source->reference = $this->git('rev-parse', $package->path, array('HEAD'));

        $this->console->output("Made <comment>$package->name</comment> require <comment>$requiredPackage $newVersion</comment>");

        $this->pushPackages[ $package->name ] = $package;
    }

    /**
     * Reload the requires from $package composer.json to $package->requires
     *
     * If $detectChanges, and there are changes on the requirements not in
     * $ignorePackages composer update is requested
     *
     * @param Package $package The package
     *
     * @deprecated Use $package->reloadRequires()
     *
     * @return void
     */
    protected function reloadRequires($package)
    {
        $package->reloadRequires();
    }

    /**
     * Checkout a package at a branch
     *
     * @param Package $package The package
     * @param string  $branch  The branch
     * @param bool    $create  Create the branch if it doesn't exist
     *
     * @return bool|null Whether checkout was successful or null when package is
     *                   already at this branch
     */
    protected function checkoutPackage($package, $branch, $create = false)
    {
        $this->assertPackageIsWhiteListed($package);

        if ($package->branch === $branch) {
            return null;
        }
        if (!$package->git) {
            throw new Exception('Non git package can not be checked out');
        }
        $remoteBranch = 'origin/' . $branch;
        $isRemote = in_array($remoteBranch, $package->branches, true);
        if (in_array($branch, $package->branches, true)) {
            $this->git('checkout', $package->path, $branch);
        } elseif ($isRemote) {
            $this->git('checkout', $package->path, array('b' => $branch, $remoteBranch));
        } elseif ($create) {
            $branches = array_unique(
                array_map(
                    function ($el) {
                        $parts = explode('/', $el);

                        return array_pop($parts);
                    },
                    $package->branches
                )
            );
            sort($branches);
            $inferFromBranch = $this->choose(
                "Select branch to create new branch '$branch' from in {$package->name}",
                $branches, in_array('master', $branches, true) ? 'master' : $branch
            );
            if ($inferFromBranch !== $package->branch) {
                $this->checkoutPackage($package, $inferFromBranch);
            }
            $this->git('checkout', $package->path, array('b' => $branch));
            $package->branches[] = $branch;
        } else {
            return false;
        }

        if ($isRemote) {
            if (!isset($package->upstreams[ $branch ]) || $package->upstreams[ $branch ] !== $remoteBranch) {
                $this->git('branch', $package->path, array('u' => $remoteBranch));
                $package->upstreams[ $branch ] = $remoteBranch;
            }
            $this->git('rebase', $package->path);
        }

        $this->console->output("Checked out <comment>{$package->name}</comment> at <comment>$branch</comment>");

        $package->reloadRequires();
        $package->version = 'dev-' . $branch;
        $package->branch = $branch;

        return true;
    }

    /**
     * Merge a $branch into $package's current branch
     *
     * @param Package $package The package
     * @param string  $branch  The branch
     * @param null    $message The commit message (if any)
     * @param bool    $squash  Whether to squash the changes
     *
     * @return void
     */
    protected function mergePackage($package, $branch, $message = null, $squash = false)
    {
        $this->preparePackageForMerge($package, $branch);
        $mergeOptions = $this->setMergeOptions($branch, $squash);

        try {
            $this->git('merge', $package->path, $mergeOptions);
        } catch (\Exception $e) {
            $this->console->output($e->getMessage());
            $conflictedFiles = $this->resolveMergeConflicts($package);
        }

        if (isset($conflictedFiles) || $this->git('status', $package->path, array('porcelain' => true))) {
            $this->console->output('You are merging package <comment>' . $package->name . '</comment> from <comment>' . $branch . '</comment> into <comment>' . $package->branch . "</comment>.\n");
            if (!$message) {
                $message = $this->answer(
                    'Enter commit message:',
                    'Merged ' . $branch . ' into ' . $package->branch
                );
            }
            $this->git('commit', $package->path, array('n' => true, 'm' => $message));
        }

        $this->console->output("Merged with <comment>$branch</comment> in <comment>{$package->name}</comment>");

        $package->reloadRequires();
        $this->pushPackages[ $package->name ] = $package;
    }

    /**
     * Check that package is white-listed, is git-package and up-to-date
     *
     * @param $package
     * @param $branch
     *
     * @return void
     *
     * @throws Exception
     */
    private function preparePackageForMerge($package, $branch)
    {
        $this->assertPackageIsWhiteListed($package);

        if (!$package->git) {
            throw new Exception('Non git package can not be merged');
        }

        $this->git('fetch', $package->path, array('force' => true, 'origin', $branch . ':' . $branch));
    }

    /**
     * Set the options for the merge command
     *
     * @param string $branch branch to merge
     * @param bool   $squash is --squash-option set
     *
     * @return array
     */
    private function setMergeOptions($branch, $squash)
    {
        $mergeOptions = array();

        if ($squash) {
            $mergeOptions['squash'] = true;
            $mergeOptions['no-commit'] = false;
        } else {
            $mergeOptions['no-commit'] = true;
            $ff = $branch == 'master' ? 'ff' : 'no-ff';
            $mergeOptions[ $ff ] = true;
        }

        $mergeOptions[] = $branch;

        return $mergeOptions;
    }

    /**.
     * Try to solve merge conflicts
     *
     * @param Package $package
     *
     * @return array
     *
     * @throws Exception
     */
    private function resolveMergeConflicts($package)
    {
        $diff = $this->git('diff', $package->path, array('name-only' => true, 'diff-filter' => 'U'));
        $conflictedFiles = array_flip(explode("\n", $diff));
        if (array_key_exists('composer.json', $conflictedFiles)) {
            try {
                $this->resolveRequirementsConflict($package);
                $this->git('add', $package->path, 'composer.json');
            } catch (Exception $conflictSolvingException) {

            }
        }
        if (array_diff(array_keys($conflictedFiles), ['composer.json'])) {
            throw new Exception(
                'There are unresolved conflicts - please resolve them and then commit the result',
                1458307785, isset($conflictSolvingException) ? $conflictSolvingException : null
            );
        } elseif (isset($conflictSolvingException)) {
            throw $conflictSolvingException;
        }

        return $conflictedFiles;
    }

    /**
     * Try to solve conflicts inside the require section of the $package
     * composer.json
     *
     * @param Package $package The package
     *
     * @return void
     */
    private function resolveRequirementsConflict($package)
    {
        $contents = file_get_contents($package->path . '/composer.json');
        $ours = @json_decode(
            preg_replace('/^<{7}.+\n(.+)\n(\|{7}|={7}).+>{7}.+$/smU', '$1', $contents)
        );
        $theirs = @json_decode(
            preg_replace('/^<{7}.+\n={7}\n(.+)\n>{7}.+$/smU', '$1', $contents)
        );
        if (!is_object($ours) || !is_object($theirs)) {
            throw new Exception('Could not regenerate json file from solved conflicts');
        }
        $diff = array_diff_key($theirs = get_object_vars($theirs), $ours = get_object_vars($ours));
        foreach ($ours as $key => $value) {
            if ($key !== 'require' && (!array_key_exists($key, $theirs) || serialize($value) !== serialize($theirs[ $key ]))) {
                $diff[ $key ] = $value;
            }
        }
        if ($diff !== array()) {
            throw new Exception('Can not automerge composer.json due to conflicts outside require object', 1458307516);
        }

        $theirs['require'] = $this->mergeRequirements($package, $ours, $theirs);
        file_put_contents($package->path . '/composer.json', $this->jsonEncode($theirs));
    }

    /**
     * Encode a variable for JSON file
     *
     * @param mixed $var The var
     *
     * @return string
     */
    protected function jsonEncode($var)
    {
        return json_encode(
            $var, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
        ) . "\n";
    }

    /**
     * Merge the requirements from different sides of the current $package
     *
     * @param Package $package The current package
     * @param array   $ours    Our composer.json as array
     * @param array   $theirs  Their composer.json as array
     *
     * @return array
     */
    private function mergeRequirements($package, array $ours, array $theirs)
    {
        $oursRequire = isset($ours['require']) && is_object($ours['require']) ? get_object_vars($ours['require']) : [];
        $theirsRequire = isset($theirs['require']) && is_object($theirs['require']) ? get_object_vars($theirs['require']) : [];
        $mergedRequires = array_merge($oursRequire, $theirsRequire);
        $packages = $this->getPackages(false, false);
        $preferredVersion = 'dev-' . $package->branch;
        foreach ($mergedRequires as $packageName => $version) {
            $actualVersion = ($version === '@dev') ? 'dev-master' : $version;
            if (array_key_exists($packageName, $oursRequire)
                && $version !== $oursRequire[ $packageName ]
                && $actualVersion !== $oursRequire[ $packageName ]
                && $actualVersion !== $preferredVersion
                && array_key_exists($packageName, $packages)
                && in_array($package->branch, $packages[ $packageName ]->branches, true)
            ) {
                $mergedRequires[ $packageName ] = $preferredVersion;
            }
        }

        return $mergedRequires;
    }

    /**
     * Get the allowed packages
     *
     * @param bool $gitOnly     If git packages should be returned only
     * @param bool $allowedOnly If allowed packages should be returned only
     *
     * @return \Netresearch\Kite\Service\Composer\Package[]
     */
    protected function getPackages($gitOnly = true, $allowedOnly = true)
    {
        /* @var $packages \Netresearch\Kite\Service\Composer\Package[] */
        /* @var $package \Netresearch\Kite\Service\Composer\Package */
        $packages = array();
        foreach ($this->get('composer.packages') as $package) {
            if ((!$gitOnly || $package->git) && (!$allowedOnly || $this->isPackageAllowed($package))) {
                $packages[ $package->name ] = $package;
            }
        }

        return $packages;
    }

    /**
     * Assert that package is in white lists
     *
     * @param Package $package The package
     *
     * @throws Exception
     *
     * @return void
     */
    protected function assertPackageIsWhiteListed($package)
    {
        if ($this->isPackageWhiteListed($package) === false) {
            throw new Exception("Package {$package->name} is not in white list");
        }
    }

    /**
     * Determine if a package is not excluded by the packages option or white lists
     *
     * @param Package $package The package
     *
     * @return bool
     */
    protected function isPackageAllowed(Package $package)
    {
        if (!is_array($this->packageNames)) {
            $this->packageNames = array_fill_keys($this->get('packages') ? : [], null);
        }

        if ($this->packageNames) {

            if (!array_key_exists($package->name, $this->packageNames)) {
                return false;
            }
            if ($this->isPackageWhiteListed($package) === false) {
                if ($this->packageNames[ $package->name ] === null) {
                    $this->packageNames[ $package->name ] = $this->confirm("The package $package->name is excluded by your whitelist configuration - are you sure you want to include it anyway?");
                }

                return $this->packageNames[ $package->name ];
            }

            return true;
        }

        return $this->isPackageWhiteListed($package) !== false;
    }

    /**
     * Determine if package is white listed
     *
     * @param Package $package The package
     *
     * @return bool|null
     */
    protected function isPackageWhiteListed(Package $package)
    {
        if (!is_array($this->whitelists)) {
            $this->whitelists = [];
            foreach (['path', 'remote', 'name'] as $whiteListType) {
                $option = $this->get('whitelist' . ucfirst($whiteListType) . 's');
                if ($option) {
                    $this->whitelists[ $whiteListType ] = '#^' . $option . '$#';
                }
            }
        }

        foreach ($this->whitelists as $type => $pattern) {
            $subject = $package->$type;
            if ($type === 'path') {
                $subject = rtrim(
                    $this->console->getFilesystem()->findShortestPath(
                        $this->get('composer.rootPackage.path'),
                        $subject,
                        true
                    ),
                    '/'
                );
            }
            if (preg_match($pattern, $subject)) {
                return true;
            }
        }

        return $this->whitelists ? false : null;
    }
}

?>


1			<?php
2			/**
3			* See class comment
4			*
5			* PHP Version 5
6			*
7			* @category Netresearch
8			* @package Netresearch\Kite\Workflow
9			* @subpackage Composer
10			* @author Christian Opitz <[email protected]>
11			* @license http://www.netresearch.de Netresearch Copyright
12			* @link http://www.netresearch.de
13			*/
14
15			namespace Netresearch\Kite\Workflow\Composer;
16			use Netresearch\Kite\Service\Composer\Package;
17			use Netresearch\Kite\Workflow;
18			use Netresearch\Kite\Exception;
19
20			/**
21			* Abstract for composer workflows
22			*
23			* @category Netresearch
24			* @package Netresearch\Kite\Workflow
25			* @subpackage Composer
26			* @author Christian Opitz <[email protected]>
27			* @license http://www.netresearch.de Netresearch Copyright
28			* @link http://www.netresearch.de
29			*/
30			abstract class Base extends Workflow
31			{
32			/**
33			* @var Package[]
34			*/
35			protected $pushPackages = array();
36
37			/**
38			* @var array
39			*/
40			protected $whitelists;
41
42			/**
43			* @var array
44			*/
45			protected $packageNames;
46
47			/**
48			* Configure the variables
49			*
50			* @return array
51			*/
52			protected function configureVariables()
53			{
54			$config = $this->getParent()->get('config');
55			if (!array_key_exists('composer', $config)) {
56			$config['composer'] = [];
57			}
58			foreach (['whitelistNames', 'whitelistPaths', 'whitelistRemotes'] as $key) {
59			if (!array_key_exists($key, $config['composer'])) {
60			$config['composer'][ $key ] = null;
61			}
62			}
63
64			return [
65			'packages' => array(
66			'type' => 'array',
67			'label' => 'Package name(s) to limit this operation to',
68			'shortcut' => 'p',
69			'option' => true
70			),
71			'whitelistNames' => array(
72			'default' => '{config["composer"]["whitelistNames"]}',
73			'type' => 'string',
74			'label' => 'Regular expression for package names, to limit this operation to',
75			'option' => true
76			),
77			'whitelistPaths' => array(
78			'default' => '{config["composer"]["whitelistPaths"]}',
79			'type' => 'string',
80			'label' => 'Regular expression for package paths, to limit this operation to',
81			'option' => true
82			),
83			'whitelistRemotes' => array(
84			'default' => '{config["composer"]["whitelistRemotes"]}',
85			'type' => 'string',
86			'label' => 'Regular expression for package remote urls, to limit this operation to',
87			'option' => true
88			),
89			'--'
90			] + parent::configureVariables();
91			}
92
93
94			/**
95			* Push all packages marked to be pushed
96			*
97			* @return void
98			*/
99			protected function pushPackages()
100			{
101			foreach ($this->pushPackages as $i => $package) {
102			$this->assertPackageIsWhiteListed($package);
103			$this->console->output("Pushing <comment>$package->name</comment>", false);
104			$this->git('push', $package->path, array('u' => 'origin', $package->branch));
105			$this->console->output(
106			str_repeat(chr(8), strlen($package->name))
107			. '<info>' . $package->name . '</info>'
108			);
109			unset($this->pushPackages[ $i ]);
110			}
111			}
112
113			/**
114			* doComposerUpdateIfNecessary and possible
115			*
116			* @return void
117			*/
118			protected function doComposerUpdate()
119			{
120			try {
121			$this->composer('update');
122			} catch (\Exception $e) {
123			$this->console->output('<warning>Composer update failed</warning>');
124			$this->console->output('<comment>This might have occured because previous pushes to git did not reache the composer repo yet</comment>');
125			if ($this->confirm('Retry?')) {
126			$this->doComposerUpdate();
127			} else {
128			$this->doExit('', 1);
129			}
130			}
131			}
132
133			/**
134			* Go through all packages and check if packages requiring those packages,
135			* still require their (likely new) versions.
136			*
137			* If not and $autoFix or user agrees, the require-statements in the
138			* dependent packages are changed accordingly.
139			*
140			* @param Package[] $packages Packages
141			* @param bool $autoFix Whether to autofix wrong requirements
142			*
143			* @return void
144			*/
145			protected function rewriteRequirements(array &$packages, $autoFix = false)
146			{
147			$checkedOutPackages = array_keys($packages);
148			$unfixedRequirements = 0;
149			while ($packageName = array_shift($checkedOutPackages)) {
150			$branch = $packages[ $packageName ]->branch;
151			$version = 'dev-' . $branch;
152			foreach ($this->getPackages(false, false) as $package) {
153			if (array_key_exists($packageName, $package->requires)) {
154			// TODO: Set required version to branch alias, if any
155			$requiredVersion = $package->requires[ $packageName ];
156			if ($requiredVersion === '@dev') {
157			$requiredVersion = 'dev-master';
158			}
159			if ($requiredVersion !== $version) {
160			$this->assertPackageIsWhiteListed($package);
161			if (!$package->git) {
162			throw new Exception("Package {$package->name} required to be installed from source");
163			}
164			if ($autoFix) {
165			$fix = true;
166			$this->output("Changing required version of {$packageName} in {$package->name} from {$requiredVersion} to {$version}");
167			} else {
168			$this->output("<warning>{$package->name} depends on {$packageName} {$package->requires[$packageName]} and not {$version} as expected</warning>");
169			$this->output('<comment>If you don\'t fix that, the branches will probably change with composer update</comment>');
170			$fix = $this->confirm('Fix that?');
171			}
172			if ($fix) {
173			if ($this->checkoutPackage($package, $branch, true)) {
174			$checkedOutPackages[] = $package->name;
175			}
176			if (!array_key_exists($package->name, $packages)) {
177			$packages[ $package->name ] = $package;
178			}
179			$this->pushPackages[ $packageName ] = $packages[ $packageName ];
180			$this->rewriteRequirement($package, $packageName, $version);
181			} else {
182			$unfixedRequirements++;
183			}
184			}
185			}
186			}
187			}
188			if ($unfixedRequirements) {
189			$this->doExit(
190			'It seems like a composer update is required but due to probably incorrect dependencies you have to do that manually', 1
191			);
192			}
193			}
194
195			/**
196			* Change the require statement for $requiredPackage to the newVersion in
197			* $package
198			*
199			* @param Package $package The package
200			* @param string $requiredPackage The required package
201			* @param string $newVersion The new version
202			*
203			* @return void
204			*/
205			protected function rewriteRequirement($package, $requiredPackage, $newVersion)
206			{
207			$this->assertPackageIsWhiteListed($package);
208
209			$currentVersion = $package->requires[ $requiredPackage ];
210			$composerFile = $package->path . '/composer.json';
211			$composerFileContents = file_get_contents($composerFile);
212			$newComposerFileContents = preg_replace(
213			sprintf(
214			'/(^\s"require"\s:\s\{[^\}]+"%s"\s:\s*")%s/m',
215			preg_quote($requiredPackage, '/'),
216			preg_quote($currentVersion, '/')
217			),
218			'$1' . $newVersion,
219			$composerFileContents
220			);
221			file_put_contents($composerFile, $newComposerFileContents);
222			$package->reloadRequires();
223			if ($package->requires[ $requiredPackage ] !== $newVersion) {
224			file_put_contents($composerFile, $composerFileContents);
225			$this->output('<error>Could not replace version</error> - generated composer.json was:');
226			$this->output($newComposerFileContents);
227			throw new Exception('Replacing version failed');
228			}
229
230			$this->git('commit', $package->path, array('n' => true, 'm' => "Change required version of $requiredPackage to $newVersion", 'composer.json'));
231			if (!isset($package->source)) {
232			$package->source = new \stdClass();
233			}
234			$package->source->reference = $this->git('rev-parse', $package->path, array('HEAD'));
235
236			$this->console->output("Made <comment>$package->name</comment> require <comment>$requiredPackage $newVersion</comment>");
237
238			$this->pushPackages[ $package->name ] = $package;
239			}
240
241			/**
242			* Reload the requires from $package composer.json to $package->requires
243			*
244			* If $detectChanges, and there are changes on the requirements not in
245			* $ignorePackages composer update is requested
246			*
247			* @param Package $package The package
248			*
249			* @deprecated Use $package->reloadRequires()
250			*
251			* @return void
252			*/
253			protected function reloadRequires($package)
254			{
255			$package->reloadRequires();
256			}
257
258			/**
259			* Checkout a package at a branch
260			*
261			* @param Package $package The package
262			* @param string $branch The branch
263			* @param bool $create Create the branch if it doesn't exist
264			*
265			* @return bool\|null Whether checkout was successful or null when package is
266			* already at this branch
267			*/
268			protected function checkoutPackage($package, $branch, $create = false)
269			{
270			$this->assertPackageIsWhiteListed($package);
271
272			if ($package->branch === $branch) {
273			return null;
274			}
275			if (!$package->git) {
276			throw new Exception('Non git package can not be checked out');
277			}
278			$remoteBranch = 'origin/' . $branch;
279			$isRemote = in_array($remoteBranch, $package->branches, true);
280			if (in_array($branch, $package->branches, true)) {
281			$this->git('checkout', $package->path, $branch);
282			} elseif ($isRemote) {
283			$this->git('checkout', $package->path, array('b' => $branch, $remoteBranch));
284			} elseif ($create) {
285			$branches = array_unique(
286			array_map(
287			function ($el) {
288			$parts = explode('/', $el);
289
290			return array_pop($parts);
291			},
292			$package->branches
293			)
294			);
295			sort($branches);
296			$inferFromBranch = $this->choose(
297			"Select branch to create new branch '$branch' from in {$package->name}",
298			$branches, in_array('master', $branches, true) ? 'master' : $branch
299			);
300			if ($inferFromBranch !== $package->branch) {
301			$this->checkoutPackage($package, $inferFromBranch);
302			}
303			$this->git('checkout', $package->path, array('b' => $branch));
304			$package->branches[] = $branch;
305			} else {
306			return false;
307			}
308
309			if ($isRemote) {
310			if (!isset($package->upstreams[ $branch ]) \|\| $package->upstreams[ $branch ] !== $remoteBranch) {
311			$this->git('branch', $package->path, array('u' => $remoteBranch));
312			$package->upstreams[ $branch ] = $remoteBranch;
313			}
314			$this->git('rebase', $package->path);
315			}
316
317			$this->console->output("Checked out <comment>{$package->name}</comment> at <comment>$branch</comment>");
318
319			$package->reloadRequires();
320			$package->version = 'dev-' . $branch;
321			$package->branch = $branch;
322
323			return true;
324			}
325
326			/**
327			* Merge a $branch into $package's current branch
328			*
329			* @param Package $package The package
330			* @param string $branch The branch
331			* @param null $message The commit message (if any)
332			* @param bool $squash Whether to squash the changes
333			*
334			* @return void
335			*/
336			protected function mergePackage($package, $branch, $message = null, $squash = false)
337			{
338			$this->preparePackageForMerge($package, $branch);
339			$mergeOptions = $this->setMergeOptions($branch, $squash);
340
341			try {
342			$this->git('merge', $package->path, $mergeOptions);
343			} catch (\Exception $e) {
344			$this->console->output($e->getMessage());
345			$conflictedFiles = $this->resolveMergeConflicts($package);
346			}
347
348			if (isset($conflictedFiles) \|\| $this->git('status', $package->path, array('porcelain' => true))) {
349			$this->console->output('You are merging package <comment>' . $package->name . '</comment> from <comment>' . $branch . '</comment> into <comment>' . $package->branch . "</comment>.\n");
350			if (!$message) {
351			$message = $this->answer(
352			'Enter commit message:',
353			'Merged ' . $branch . ' into ' . $package->branch
354			);
355			}
356			$this->git('commit', $package->path, array('n' => true, 'm' => $message));
357			}
358
359			$this->console->output("Merged with <comment>$branch</comment> in <comment>{$package->name}</comment>");
360
361			$package->reloadRequires();
362			$this->pushPackages[ $package->name ] = $package;
363			}
364
365			/**
366			* Check that package is white-listed, is git-package and up-to-date
367			*
368			* @param $package
369			* @param $branch
370			*
371			* @return void
372			*
373			* @throws Exception
374			*/
375			private function preparePackageForMerge($package, $branch)
376			{
377			$this->assertPackageIsWhiteListed($package);
378
379			if (!$package->git) {
380			throw new Exception('Non git package can not be merged');
381			}
382
383			$this->git('fetch', $package->path, array('force' => true, 'origin', $branch . ':' . $branch));
384			}
385
386			/**
387			* Set the options for the merge command
388			*
389			* @param string $branch branch to merge
390			* @param bool $squash is --squash-option set
391			*
392			* @return array
393			*/
394			private function setMergeOptions($branch, $squash)
395			{
396			$mergeOptions = array();
397
398			if ($squash) {
399			$mergeOptions['squash'] = true;
400			$mergeOptions['no-commit'] = false;
401			} else {
402			$mergeOptions['no-commit'] = true;
403			$ff = $branch == 'master' ? 'ff' : 'no-ff';
404			$mergeOptions[ $ff ] = true;
405			}
406
407			$mergeOptions[] = $branch;
408
409			return $mergeOptions;
410			}
411
412			/**.
413			* Try to solve merge conflicts
414			*
415			* @param Package $package
416			*
417			* @return array
418			*
419			* @throws Exception
420			*/
421			private function resolveMergeConflicts($package)
422			{
423			$diff = $this->git('diff', $package->path, array('name-only' => true, 'diff-filter' => 'U'));
424			$conflictedFiles = array_flip(explode("\n", $diff));
425			if (array_key_exists('composer.json', $conflictedFiles)) {
426			try {
427			$this->resolveRequirementsConflict($package);
428			$this->git('add', $package->path, 'composer.json');
429			} catch (Exception $conflictSolvingException) {
			0 ignored issues – show Coding Style Comprehensibility introduced 2016-03-18 14:36 UTC by Report Bug Copy Issue Report Consider adding a comment why this CATCH block is empty. Loading history...
430			}
431			}
432			if (array_diff(array_keys($conflictedFiles), ['composer.json'])) {
433			throw new Exception(
434			'There are unresolved conflicts - please resolve them and then commit the result',
435			1458307785, isset($conflictSolvingException) ? $conflictSolvingException : null
436			);
437			} elseif (isset($conflictSolvingException)) {
438			throw $conflictSolvingException;
439			}
440
441			return $conflictedFiles;
442			}
443
444			/**
445			* Try to solve conflicts inside the require section of the $package
446			* composer.json
447			*
448			* @param Package $package The package
449			*
450			* @return void
451			*/
452			private function resolveRequirementsConflict($package)
453			{
454			$contents = file_get_contents($package->path . '/composer.json');
455			$ours = @json_decode(
456			preg_replace('/^<{7}.+\n(.+)\n(\\|{7}\|={7}).+>{7}.+$/smU', '$1', $contents)
457			);
458			$theirs = @json_decode(
459			preg_replace('/^<{7}.+\n={7}\n(.+)\n>{7}.+$/smU', '$1', $contents)
460			);
461			if (!is_object($ours) \|\| !is_object($theirs)) {
462			throw new Exception('Could not regenerate json file from solved conflicts');
463			}
464			$diff = array_diff_key($theirs = get_object_vars($theirs), $ours = get_object_vars($ours));
465			foreach ($ours as $key => $value) {
466			if ($key !== 'require' && (!array_key_exists($key, $theirs) \|\| serialize($value) !== serialize($theirs[ $key ]))) {
467			$diff[ $key ] = $value;
468			}
469			}
470			if ($diff !== array()) {
471			throw new Exception('Can not automerge composer.json due to conflicts outside require object', 1458307516);
472			}
473
474			$theirs['require'] = $this->mergeRequirements($package, $ours, $theirs);
475			file_put_contents($package->path . '/composer.json', $this->jsonEncode($theirs));
476			}
477
478			/**
479			* Encode a variable for JSON file
480			*
481			* @param mixed $var The var
482			*
483			* @return string
484			*/
485			protected function jsonEncode($var)
486			{
487			return json_encode(
488			$var, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE
489			) . "\n";
490			}
491
492			/**
493			* Merge the requirements from different sides of the current $package
494			*
495			* @param Package $package The current package
496			* @param array $ours Our composer.json as array
497			* @param array $theirs Their composer.json as array
498			*
499			* @return array
500			*/
501			private function mergeRequirements($package, array $ours, array $theirs)
502			{
503			$oursRequire = isset($ours['require']) && is_object($ours['require']) ? get_object_vars($ours['require']) : [];
504			$theirsRequire = isset($theirs['require']) && is_object($theirs['require']) ? get_object_vars($theirs['require']) : [];
505			$mergedRequires = array_merge($oursRequire, $theirsRequire);
506			$packages = $this->getPackages(false, false);
507			$preferredVersion = 'dev-' . $package->branch;
508			foreach ($mergedRequires as $packageName => $version) {
509			$actualVersion = ($version === '@dev') ? 'dev-master' : $version;
510			if (array_key_exists($packageName, $oursRequire)
511			&& $version !== $oursRequire[ $packageName ]
512			&& $actualVersion !== $oursRequire[ $packageName ]
513			&& $actualVersion !== $preferredVersion
514			&& array_key_exists($packageName, $packages)
515			&& in_array($package->branch, $packages[ $packageName ]->branches, true)
516			) {
517			$mergedRequires[ $packageName ] = $preferredVersion;
518			}
519			}
520
521			return $mergedRequires;
522			}
523
524			/**
525			* Get the allowed packages
526			*
527			* @param bool $gitOnly If git packages should be returned only
528			* @param bool $allowedOnly If allowed packages should be returned only
529			*
530			* @return \Netresearch\Kite\Service\Composer\Package[]
531			*/
532			protected function getPackages($gitOnly = true, $allowedOnly = true)
533			{
534			/* @var $packages \Netresearch\Kite\Service\Composer\Package[] */
535			/* @var $package \Netresearch\Kite\Service\Composer\Package */
536			$packages = array();
537			foreach ($this->get('composer.packages') as $package) {
538			if ((!$gitOnly \|\| $package->git) && (!$allowedOnly \|\| $this->isPackageAllowed($package))) {
539			$packages[ $package->name ] = $package;
540			}
541			}
542
543			return $packages;
544			}
545
546			/**
547			* Assert that package is in white lists
548			*
549			* @param Package $package The package
550			*
551			* @throws Exception
552			*
553			* @return void
554			*/
555			protected function assertPackageIsWhiteListed($package)
556			{
557			if ($this->isPackageWhiteListed($package) === false) {
558			throw new Exception("Package {$package->name} is not in white list");
559			}
560			}
561
562			/**
563			* Determine if a package is not excluded by the packages option or white lists
564			*
565			* @param Package $package The package
566			*
567			* @return bool
568			*/
569			protected function isPackageAllowed(Package $package)
570			{
571			if (!is_array($this->packageNames)) {
572			$this->packageNames = array_fill_keys($this->get('packages') ? : [], null);
573			}
574
575			if ($this->packageNames) {
			0 ignored issues – show Bug Best Practice introduced 2016-06-29 15:04 UTC by Report Bug Copy Issue Report The expression `$this->packageNames` of type `array` is implicitly converted to a boolean; are you sure this is intended? If so, consider using `! empty($expr)` instead to make it clear that you intend to check for an array without elements. This check marks implicit conversions of arrays to boolean values in a comparison. While in PHP an empty array is considered to be equal (but not identical) to false, this is not always apparent. Consider making the comparison explicit by using `empty(..)` or `! empty(...)` instead. Loading history...
576			if (!array_key_exists($package->name, $this->packageNames)) {
577			return false;
578			}
579			if ($this->isPackageWhiteListed($package) === false) {
580			if ($this->packageNames[ $package->name ] === null) {
581			$this->packageNames[ $package->name ] = $this->confirm("The package $package->name is excluded by your whitelist configuration - are you sure you want to include it anyway?");
582			}
583
584			return $this->packageNames[ $package->name ];
585			}
586
587			return true;
588			}
589
590			return $this->isPackageWhiteListed($package) !== false;
591			}
592
593			/**
594			* Determine if package is white listed
595			*
596			* @param Package $package The package
597			*
598			* @return bool\|null
599			*/
600			protected function isPackageWhiteListed(Package $package)
601			{
602			if (!is_array($this->whitelists)) {
603			$this->whitelists = [];
604			foreach (['path', 'remote', 'name'] as $whiteListType) {
605			$option = $this->get('whitelist' . ucfirst($whiteListType) . 's');
606			if ($option) {
607			$this->whitelists[ $whiteListType ] = '#^' . $option . '$#';
608			}
609			}
610			}
611
612			foreach ($this->whitelists as $type => $pattern) {
613			$subject = $package->$type;
614			if ($type === 'path') {
615			$subject = rtrim(
616			$this->console->getFilesystem()->findShortestPath(
617			$this->get('composer.rootPackage.path'),
618			$subject,
619			true
620			),
621			'/'
622			);
623			}
624			if (preg_match($pattern, $subject)) {
625			return true;
626			}
627			}
628
629			return $this->whitelists ? false : null;
630			}
631			}
632
633			?>
634

netresearch / kite

GitHub Access Token became invalid

Push — master ( 096e0a...7c9715 )

Base::resolveMergeConflicts() B

Complexity

Size

Duplication

Importance

Duplication Side-by-Side

Filter issues like