Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing configuration for git_conflict #318

Merged
merged 1 commit into from Feb 27, 2017
Merged

Add missing configuration for git_conflict #318

merged 1 commit into from Feb 27, 2017

Conversation

jyggen
Copy link
Contributor

@jyggen jyggen commented Feb 27, 2017

Q A
Branch master
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Documented? -
Fixed tickets -

Seems like the git_conflict task isn't registered.

@veewee veewee added the bug label Feb 27, 2017
@veewee veewee added this to the Version 0.11.4 milestone Feb 27, 2017
@veewee
Copy link
Contributor

veewee commented Feb 27, 2017

Thanks for noticing!

@veewee veewee merged commit 8df21d4 into phpro:master Feb 27, 2017
task.git.conflict:
class: GrumPHP\Task\Git\Conflict
arguments:
- '@config'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To less parameters here, as it extends AbstractExternalTask.

Stack trace:
#0 [internal function]: GrumPHP\Task\AbstractExternalTask->__construct(Object(GrumPHP\Configuration\GrumPHP))
#1 ./vendor/symfony/dependency-injection/ContainerBuilder.php(900): ReflectionClass->newInstanceArgs(Array)
#2 ./vendor/symfony/dependency-injection/ContainerBuilder.php(451): Symfony\Component\DependencyInjection\ContainerBuilder->createService(Object(Symfony\Component\DependencyInjection\Definition), 'task.git.confli...')
#3 ./vendor/symfony/dependency-injection/ContainerBuilder.php(957): Symfony\Component\DependencyInjection\ContainerBuilder->get('task.git.confli...', 1)
#4 . in ./vendor/phpro/grumphp/src/Task/AbstractExternalTask.php on line 31

@jyggen jyggen deleted the patch-2 branch October 5, 2017 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants