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

Commit

Permalink
Merge branch 'release/5.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ezzatron committed Jan 29, 2014
2 parents f5a1d32 + d698ff0 commit 01f3456
Show file tree
Hide file tree
Showing 33 changed files with 124 additions and 116 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
#
language: php

php: ["5.3", "5.4", "5.5"]
php: ["5.3", "5.4", "5.5", "hhvm"]

matrix:
allow_failures:
- php: hhvm

env:
global:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Enumeration changelog

## 5.0.1 (2014-01-29)

- **[MAINTENANCE]** General repository maintenance

## 5.0.0 (2013-11-11)

- **[BC BREAK]** Renamed classes:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright © 2013 Erin Millard
Copyright © 2014 Erin Millard

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

*An enumeration implementation for PHP.*

[![Build Status]][Latest build]
[![Test Coverage]][Test coverage report]
[![Uses Semantic Versioning]][SemVer]
[![The most recent stable version is 5.0.1][version-image]][Semantic versioning]
[![Current build status image][build-image]][Current build status]
[![Current coverage status image][coverage-image]][Current coverage status]

## Installation and documentation

Expand All @@ -23,7 +23,7 @@ is considered invalid.

## A basic example

Enumeration can be used like [C++ enumerated types]. Here is an example,
*Enumeration* can be used like [C++ enumerated types]. Here is an example,
representing a set of HTTP request methods:

```php
Expand Down Expand Up @@ -84,8 +84,8 @@ They can have additional properties and/or methods, and are really just a
specialised kind of class where there are a fixed set of instances.

This is sometimes called the [Multiton] pattern, and in fact, all enumerations
in this implementation are Multitons. The *Enumeration* class simply defines its
members based upon class constants.
in this implementation are Multitons. The `AbstractEnumeration` class simply
defines its members based upon class constants.

Here is an example borrowed from the Java documentation for its enum types. The
following multiton describes all of the planets in our solar system, including
Expand Down Expand Up @@ -261,17 +261,17 @@ function handleCustomHttpRequest(

<!-- References -->

[API documentation]: http://lqnt.co/enumeration/artifacts/documentation/api/
[C++ enumerated types]: http://www.learncpp.com/cpp-tutorial/45-enumerated-types/
[Composer]: http://getcomposer.org/
[eloquent/enumeration]: https://packagist.org/packages/eloquent/enumeration
[enumeration]: https://github.com/eloquent/enumeration
[Java's enum types]: http://docs.oracle.com/javase/tutorial/java/javaOO/enum.html
[Multiton]: http://en.wikipedia.org/wiki/Multiton_pattern

[Build Status]: https://api.travis-ci.org/eloquent/enumeration.png?branch=master
[Latest build]: https://travis-ci.org/eloquent/enumeration
[SemVer]: http://semver.org/
[Test coverage report]: https://coveralls.io/r/eloquent/enumeration
[Test Coverage]: https://coveralls.io/repos/eloquent/enumeration/badge.png?branch=master
[Uses Semantic Versioning]: http://b.repl.ca/v1/semver-yes-brightgreen.png
[API documentation]: http://lqnt.co/enumeration/artifacts/documentation/api/
[Composer]: http://getcomposer.org/
[build-image]: http://img.shields.io/travis/eloquent/enumeration/develop.svg "Current build status for the develop branch"
[Current build status]: https://travis-ci.org/eloquent/enumeration
[coverage-image]: http://img.shields.io/coveralls/eloquent/enumeration/develop.svg "Current test coverage for the develop branch"
[Current coverage status]: https://coveralls.io/r/eloquent/enumeration
[eloquent/enumeration]: https://packagist.org/packages/eloquent/enumeration
[Semantic versioning]: http://semver.org/
[version-image]: http://img.shields.io/:semver-5.0.1-brightgreen.svg "This project uses semantic versioning"
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"icecave/archer": "~1"
},
"autoload": {
"psr-0": {
"Eloquent\\Enumeration": "src"
"psr-4": {
"Eloquent\\Enumeration\\": "src"
}
}
}
Loading

0 comments on commit 01f3456

Please sign in to comment.