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

Removed IterableFileSet #835

Merged
merged 2 commits into from
Jan 17, 2018
Merged

Conversation

siad007
Copy link
Member

@siad007 siad007 commented Dec 30, 2017

Closes #531

@siad007 siad007 added the core label Dec 30, 2017
@siad007 siad007 added this to the 3.0 RC1 milestone Dec 30, 2017
@mrook
Copy link
Member

mrook commented Jan 9, 2018

@siad007 can you resolve the conflicts?

@mrook mrook merged commit cdd1672 into phingofficial:master Jan 17, 2018
@MaXal
Copy link

MaXal commented Jan 19, 2018

In our tests we now have the following error:
Fatal error: Declaration of ZendGuardFileSet::getFiles(Project $p, $includeEmpty = true) must be compatible with AbstractFileSet::getFiles(...$options) in /app/vendor/phing/phing/classes/phing/tasks/ext/zendguard/ZendGuardFileSet.php on line 32

@siad007 siad007 deleted the RemoveIterableFs branch January 19, 2018 22:55
@MaXal
Copy link

MaXal commented Jan 22, 2018

Now we have:
Parse error: syntax error, unexpected '=', expecting variable (T_VARIABLE) in /app/vendor/phing/phing/classes/phing/tasks/ext/zendguard/ZendGuardFileSet.php on line 23

@MaXal
Copy link

MaXal commented Jan 22, 2018

You've missed the $ before the parameter name. Don't you use PhpStorm:)?

@mrook
Copy link
Member

mrook commented Jan 22, 2018

Thanks for pointing that out @MaXal, it should be fixed now. As a general rule, I recommend not using phing master directly (if you can avoid it). We try to avoid breaking it, but that's not always possible.

@MaXal
Copy link

MaXal commented Jan 22, 2018

@mrook We're using Phing's master branch in our tests for PhpStorm to provide up-to-date support of Phing. That helps us to follow you in development and do small changes incrementally instead of making one big pass when you publish a release.

@mrook
Copy link
Member

mrook commented Jan 22, 2018

@MaXal ah! I did not realize you were part of the PhpStorm team, welcome :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants