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

Fix compatibility with Nette 2.4 #106

Closed
wants to merge 1 commit into from

Conversation

Projects
None yet
2 participants
@enumag
Copy link
Member

commented Apr 19, 2016

No description provided.

@enumag

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2016

This one is failing because of Kdyby/Monolog. I don't use that one (yet) but I can send PR there as well.

@enumag

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2016

@enumag

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2016

@fprochazka You seem to have a habit of releasing new versions after merging these fixes. So this is an attempt to get a new release of Translation as well. :-P

@fprochazka

This comment has been minimized.

Copy link
Member

commented Apr 19, 2016

@enumag well, if I already have my sleeves rolled up... :)

@enumag enumag force-pushed the enumag:compatibility branch from 6b752f8 to 8484d67 Apr 19, 2016

@@ -412,7 +412,7 @@ protected function validateResource($format, $file, $locale, $domain)
try {
$def = $builder->getDefinition($this->loaders[$format]);
$refl = Reflection\ClassType::from($def->factory ? $def->factory->entity : $def->class);
$refl = Reflection\ClassType::from($def->getFactory() ? $def->getEntity() : $def->getClass());

This comment has been minimized.

Copy link
@fprochazka

fprochazka Apr 19, 2016

Member

Imho this can be changed to $def->getEntity() ?: $def->getClass()

This comment has been minimized.

Copy link
@enumag

enumag Apr 19, 2016

Author Member

Right. 👍

@enumag enumag force-pushed the enumag:compatibility branch from 8484d67 to 040913d Apr 19, 2016

@fprochazka

This comment has been minimized.

Copy link
Member

commented Apr 19, 2016

Thank you!

@enumag

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2016

The build didn't pass yet you know... Packagist didn't catch up with Monolog...

@fprochazka

This comment has been minimized.

Copy link
Member

commented Apr 19, 2016

It passed on my localhost :)

@fprochazka

This comment has been minimized.

Copy link
Member

commented Apr 19, 2016

The --prefer-lowest might fail, but I'll fix that.

@enumag

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2016

Alright then. Thanks. :-) I was trying to test it on my localhost as well but some tests are failing there for CRLF reasons. :-(

@fprochazka

This comment has been minimized.

Copy link
Member

commented Apr 19, 2016

@enumag your wish has been granted :)

@enumag

This comment has been minimized.

Copy link
Member Author

commented Apr 19, 2016

@fprochazka Awesome, thank you! :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.