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

php-cs-fixer PreIncrementFixer #898

Merged
merged 2 commits into from Jul 28, 2015

Conversation

webdevsHub
Copy link
Contributor

some housekeeping:

php-cs-fixer recently added PreIncrementFixer in 1.9 to symfony level. See also the discussion.

@ruflin
Copy link
Owner

ruflin commented Jul 28, 2015

@webdevsHub If it is in 1.9 also the php-cs-fixer dependencies should be updated: https://github.com/ruflin/Elastica/blob/master/Dockerfile#L40

@webdevsHub
Copy link
Contributor Author

Okay, I am going to do this before merge

@webdevsHub
Copy link
Contributor Author

I modified Dockerfile to RUN composer global require "fabpot/php-cs-fixer=1.10.*"
but make run RUN="make lint" do not touch the files.

I downloaded it manually and php php-cs-fixer.phar fix --config-file=./.php_cs (with 1.10) changes one file lib/Elastica/Aggregation/ReverseNested.php. I am not into docker, but seems like I have to rebuild it or something?

@ruflin
Copy link
Owner

ruflin commented Jul 28, 2015

Yes, the image has to be rebuilt. The problem is, that by default it takes the remote image. As soon as we merge the pull request, it will build the new image. In the docker compose file a line is commented out. If you switch the comment, it will build it locally.

I suggest you push it here and we merge it. There is nothing major that can break ;-)

@webdevsHub
Copy link
Contributor Author

that worked thx! Should be ready to merge

ruflin added a commit that referenced this pull request Jul 28, 2015
@ruflin ruflin merged commit 704cf6c into ruflin:master Jul 28, 2015
@ruflin
Copy link
Owner

ruflin commented Jul 28, 2015

Merged. Thx.

@ruflin
Copy link
Owner

ruflin commented Jul 28, 2015

@webdevsHub Here you can see that it just created the newest build for the latest push: https://registry.hub.docker.com/u/ruflin/elasticsearch-elastica/builds_history/205891/

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

Successfully merging this pull request may close these issues.

None yet

2 participants