Skip to content
This repository has been archived by the owner on Jul 3, 2020. It is now read-only.

Changes "@licence" with "@license" #328

Merged

Conversation

manuakasam
Copy link
Contributor

As pointed out by @grizzm0 the proper docblock is @license

We ran into the issue that our logger uses JMS Serializer (which internally uses an annotation parser) to log any kind of objects that get serialized into JSON. However due to the misspelling of licence it tried to find a parser for @licence which doesn't exist :)

@coveralls
Copy link

Coverage Status

Coverage remained the same at 93.142% when pulling 30446a8 on manuakasam:hotfix/license-docblock-rebased into b459677 on ZF-Commons:master.

@bakura10
Copy link
Member

Good catch!

@bakura10 bakura10 merged commit 4a8fe9a into ZF-Commons:master Mar 22, 2016
@bakura10
Copy link
Member

I've tagged as 2.5.5. Thanks!

@@ -27,8 +27,12 @@
* @method GuardInterface get($name)
*
* @author Michaël Gallego <mic.gallego@gmail.com>
<<<<<<< b459677bbe1c328d819969eed3fe7df68cb1112b
Copy link
Contributor

Choose a reason for hiding this comment

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

Accidental conflict message merged. @bakura10

@grizzm0 grizzm0 mentioned this pull request Mar 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants