From df367d5d94a29ac4428e9d848589fe1835f2c3b8 Mon Sep 17 00:00:00 2001 From: Erin Millard Date: Mon, 11 Nov 2013 12:50:49 +1000 Subject: [PATCH 1/4] Fixed badge text case. [ci skip] --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 50a1229..6a9e58e 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ *An enumeration implementation for PHP.* -[![Build Status]][Latest build] -[![Test Coverage]][Test coverage report] -[![Uses Semantic Versioning]][SemVer] +[![Build status]][Latest build] +[![Test coverage]][Test coverage report] +[![Uses semantic versioning]][SemVer] ## Installation and documentation @@ -269,9 +269,9 @@ function handleCustomHttpRequest( [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 +[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 +[Test coverage]: https://coveralls.io/repos/eloquent/enumeration/badge.png?branch=master +[Uses semantic versioning]: http://b.repl.ca/v1/semver-yes-brightgreen.png From ede9c64b251a678a9a025a994c37ce46b5a92c5e Mon Sep 17 00:00:00 2001 From: Erin Millard Date: Wed, 29 Jan 2014 19:20:16 +1000 Subject: [PATCH 2/4] Repository maintenance. --- .travis.yml | 6 +- LICENSE | 2 +- README.md | 24 +-- composer.json | 4 +- composer.lock | 140 +++++++++--------- .../Enumeration => }/AbstractEnumeration.php | 2 +- .../Enumeration => }/AbstractMultiton.php | 2 +- .../AbstractValueMultiton.php | 2 +- .../Enumeration => }/EnumerationInterface.php | 2 +- .../AbstractUndefinedMemberException.php | 2 +- .../Exception/ExtendsConcreteException.php | 2 +- .../Exception/UndefinedMemberException.php | 2 +- .../UndefinedMemberExceptionInterface.php | 2 +- .../Enumeration => }/MultitonInterface.php | 2 +- .../ValueMultitonInterface.php | 2 +- .../Test/Fixture/InvalidEnumeration.php | 2 +- .../Test/Fixture/InvalidMultiton.php | 2 +- .../Test/Fixture/InvalidValueMultiton.php | 2 +- .../Test/Fixture/TestEnumeration.php | 2 +- .../Enumeration/Test/Fixture/TestMultiton.php | 2 +- .../Test/Fixture/TestValueMultiton.php | 2 +- .../Test/Fixture/ValidEnumeration.php | 2 +- .../Test/Fixture/ValidMultiton.php | 2 +- .../Test/Fixture/ValidValueMultiton.php | 2 +- test/src/HttpRequestMethod.php | 2 +- test/src/Planet.php | 2 +- .../AbstractEnumerationTest.php | 2 +- .../Enumeration => }/AbstractMultitonTest.php | 2 +- .../AbstractValueMultitonTest.php | 2 +- .../ExtendsConcreteExceptionTest.php | 2 +- .../UndefinedMemberExceptionTest.php | 2 +- .../Enumeration => }/FunctionalTest.php | 2 +- 32 files changed, 117 insertions(+), 113 deletions(-) rename src/{Eloquent/Enumeration => }/AbstractEnumeration.php (96%) rename src/{Eloquent/Enumeration => }/AbstractMultiton.php (99%) rename src/{Eloquent/Enumeration => }/AbstractValueMultiton.php (98%) rename src/{Eloquent/Enumeration => }/EnumerationInterface.php (91%) rename src/{Eloquent/Enumeration => }/Exception/AbstractUndefinedMemberException.php (98%) rename src/{Eloquent/Enumeration => }/Exception/ExtendsConcreteException.php (98%) rename src/{Eloquent/Enumeration => }/Exception/UndefinedMemberException.php (97%) rename src/{Eloquent/Enumeration => }/Exception/UndefinedMemberExceptionInterface.php (95%) rename src/{Eloquent/Enumeration => }/MultitonInterface.php (97%) rename src/{Eloquent/Enumeration => }/ValueMultitonInterface.php (93%) rename test/suite/{Eloquent/Enumeration => }/AbstractEnumerationTest.php (99%) rename test/suite/{Eloquent/Enumeration => }/AbstractMultitonTest.php (99%) rename test/suite/{Eloquent/Enumeration => }/AbstractValueMultitonTest.php (99%) rename test/suite/{Eloquent/Enumeration => }/Exception/ExtendsConcreteExceptionTest.php (96%) rename test/suite/{Eloquent/Enumeration => }/Exception/UndefinedMemberExceptionTest.php (97%) rename test/suite/{Eloquent/Enumeration => }/FunctionalTest.php (99%) diff --git a/.travis.yml b/.travis.yml index 73a4423..4428537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/LICENSE b/LICENSE index f23d006..54584b1 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/README.md b/README.md index 6a9e58e..328659e 100644 --- a/README.md +++ b/README.md @@ -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.0][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 @@ -261,17 +261,17 @@ function handleCustomHttpRequest( -[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.0-brightgreen.svg "This project uses semantic versioning" diff --git a/composer.json b/composer.json index b1a7e8c..e5b04ff 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "icecave/archer": "~1" }, "autoload": { - "psr-0": { - "Eloquent\\Enumeration": "src" + "psr-4": { + "Eloquent\\Enumeration\\": "src" } } } diff --git a/composer.lock b/composer.lock index 9ce628e..9682c60 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "0791ef83547c5df87110f2664accadde", + "hash": "7566c9c129b5d3366dfcb4ac00581b6a", "packages": [ ], @@ -69,16 +69,16 @@ }, { "name": "guzzle/guzzle", - "version": "v3.7.4", + "version": "v3.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b170b028c6bb5799640e46c8803015b0f9a45ed9" + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b170b028c6bb5799640e46c8803015b0f9a45ed9", - "reference": "b170b028c6bb5799640e46c8803015b0f9a45ed9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba", "shasum": "" }, "require": { @@ -116,19 +116,19 @@ "phpunit/phpunit": "3.7.*", "psr/log": "1.0.*", "symfony/class-loader": "*", - "zendframework/zend-cache": "2.0.*", - "zendframework/zend-log": "2.0.*" + "zendframework/zend-cache": "<2.3", + "zendframework/zend-log": "<2.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7-dev" + "dev-master": "3.8-dev" } }, "autoload": { "psr-0": { - "Guzzle\\Tests": "tests/", - "Guzzle": "src/" + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" } }, "notification-url": "https://packagist.org/downloads/", @@ -157,20 +157,20 @@ "rest", "web service" ], - "time": "2013-10-02 20:47:00" + "time": "2014-01-28 22:29:15" }, { "name": "icecave/archer", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/IcecaveStudios/archer.git", - "reference": "5ab6803e2fbcb27cbad8624f7f137477a5ca0fb3" + "reference": "c8f777640f216f75d10905619135d4f92bb0223f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/IcecaveStudios/archer/zipball/5ab6803e2fbcb27cbad8624f7f137477a5ca0fb3", - "reference": "5ab6803e2fbcb27cbad8624f7f137477a5ca0fb3", + "url": "https://api.github.com/repos/IcecaveStudios/archer/zipball/c8f777640f216f75d10905619135d4f92bb0223f", + "reference": "c8f777640f216f75d10905619135d4f92bb0223f", "shasum": "" }, "require": { @@ -229,7 +229,7 @@ "testing", "unit" ], - "time": "2013-10-13 23:54:24" + "time": "2014-01-21 01:56:19" }, { "name": "nikic/php-parser", @@ -530,17 +530,17 @@ }, { "name": "symfony/config", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "1ced3d6c88b22df8cd1fe5209dbd6a89df362a29" + "reference": "27d0b35879ebefcfee6d218512c32ab2d6cd6a6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/1ced3d6c88b22df8cd1fe5209dbd6a89df362a29", - "reference": "1ced3d6c88b22df8cd1fe5209dbd6a89df362a29", + "url": "https://api.github.com/repos/symfony/Config/zipball/27d0b35879ebefcfee6d218512c32ab2d6cd6a6a", + "reference": "27d0b35879ebefcfee6d218512c32ab2d6cd6a6a", "shasum": "" }, "require": { @@ -550,7 +550,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -574,21 +574,21 @@ ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2013-09-19 09:45:20" + "time": "2014-01-01 08:14:50" }, { "name": "symfony/console", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "f880062d56edefb25b36f2defa65aafe65959dc7" + "reference": "4c1ed2ff514bd85ee186eebb010ccbdeeab05af7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/f880062d56edefb25b36f2defa65aafe65959dc7", - "reference": "f880062d56edefb25b36f2defa65aafe65959dc7", + "url": "https://api.github.com/repos/symfony/Console/zipball/4c1ed2ff514bd85ee186eebb010ccbdeeab05af7", + "reference": "4c1ed2ff514bd85ee186eebb010ccbdeeab05af7", "shasum": "" }, "require": { @@ -603,7 +603,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -627,21 +627,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2013-09-25 06:04:15" + "time": "2014-01-01 08:14:50" }, { "name": "symfony/event-dispatcher", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "7fc72a7a346a1887d3968cc1ce5642a15cd182e9" + "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7fc72a7a346a1887d3968cc1ce5642a15cd182e9", - "reference": "7fc72a7a346a1887d3968cc1ce5642a15cd182e9", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e3ba42f6a70554ed05749e61b829550f6ac33601", + "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601", "shasum": "" }, "require": { @@ -657,7 +657,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -681,21 +681,21 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2013-09-19 09:45:20" + "time": "2013-12-28 08:12:03" }, { "name": "symfony/filesystem", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "2b8995042086c5552c94d33b5553c492e9cfc00e" + "reference": "b3c3b5a8108b3e5d604dc23241b4ea84a067fc78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2b8995042086c5552c94d33b5553c492e9cfc00e", - "reference": "2b8995042086c5552c94d33b5553c492e9cfc00e", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/b3c3b5a8108b3e5d604dc23241b4ea84a067fc78", + "reference": "b3c3b5a8108b3e5d604dc23241b4ea84a067fc78", "shasum": "" }, "require": { @@ -704,7 +704,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -728,21 +728,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2013-09-19 09:45:20" + "time": "2013-12-31 13:43:26" }, { "name": "symfony/finder", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "a175521f680b178e63c5d0ab87c6b046c0990c3f" + "reference": "6904345cf2b3bbab1f6d6e4ce1724cb99df9f00a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/a175521f680b178e63c5d0ab87c6b046c0990c3f", - "reference": "a175521f680b178e63c5d0ab87c6b046c0990c3f", + "url": "https://api.github.com/repos/symfony/Finder/zipball/6904345cf2b3bbab1f6d6e4ce1724cb99df9f00a", + "reference": "6904345cf2b3bbab1f6d6e4ce1724cb99df9f00a", "shasum": "" }, "require": { @@ -751,7 +751,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -775,21 +775,21 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2013-09-19 09:45:20" + "time": "2014-01-01 08:14:50" }, { "name": "symfony/process", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "81191e354fe9dad0451036ccf0fdf283649d3f1e" + "reference": "58fdccb311e44f28866f976c2d7b3227e9f713db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/81191e354fe9dad0451036ccf0fdf283649d3f1e", - "reference": "81191e354fe9dad0451036ccf0fdf283649d3f1e", + "url": "https://api.github.com/repos/symfony/Process/zipball/58fdccb311e44f28866f976c2d7b3227e9f713db", + "reference": "58fdccb311e44f28866f976c2d7b3227e9f713db", "shasum": "" }, "require": { @@ -798,7 +798,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -822,21 +822,21 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2013-10-09 21:17:57" + "time": "2014-01-05 02:10:50" }, { "name": "symfony/stopwatch", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Stopwatch", "source": { "type": "git", "url": "https://github.com/symfony/Stopwatch.git", - "reference": "1f951fa881d2e661525e81ee0afc97261ad43459" + "reference": "c8e21e1380c7eef6197a8165620da8457b7c69a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/1f951fa881d2e661525e81ee0afc97261ad43459", - "reference": "1f951fa881d2e661525e81ee0afc97261ad43459", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/c8e21e1380c7eef6197a8165620da8457b7c69a5", + "reference": "c8e21e1380c7eef6197a8165620da8457b7c69a5", "shasum": "" }, "require": { @@ -845,7 +845,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -869,21 +869,21 @@ ], "description": "Symfony Stopwatch Component", "homepage": "http://symfony.com", - "time": "2013-09-19 09:45:20" + "time": "2013-12-12 16:06:47" }, { "name": "symfony/yaml", - "version": "v2.3.6", + "version": "v2.4.1", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3" + "reference": "4e1a237fc48145fae114b96458d799746ad89aa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/6bb881b948368482e1abf1a75c08bcf88a1c5fc3", - "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/4e1a237fc48145fae114b96458d799746ad89aa0", + "reference": "4e1a237fc48145fae114b96458d799746ad89aa0", "shasum": "" }, "require": { @@ -892,7 +892,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -916,20 +916,20 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-09-22 18:04:39" + "time": "2013-12-28 08:12:03" }, { "name": "twig/twig", - "version": "v1.14.2", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64" + "reference": "85e4ff98000157ff753d934b9f13659a953f5666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/ca445842fcea4f844d68203ffa2d00f5e3cdea64", - "reference": "ca445842fcea4f844d68203ffa2d00f5e3cdea64", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666", + "reference": "85e4ff98000157ff753d934b9f13659a953f5666", "shasum": "" }, "require": { @@ -938,7 +938,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -965,7 +965,7 @@ "keywords": [ "templating" ], - "time": "2013-10-30 08:20:53" + "time": "2013-12-06 07:47:10" } ], "aliases": [ diff --git a/src/Eloquent/Enumeration/AbstractEnumeration.php b/src/AbstractEnumeration.php similarity index 96% rename from src/Eloquent/Enumeration/AbstractEnumeration.php rename to src/AbstractEnumeration.php index cdd18ab..f6fdac9 100644 --- a/src/Eloquent/Enumeration/AbstractEnumeration.php +++ b/src/AbstractEnumeration.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/AbstractMultiton.php b/src/AbstractMultiton.php similarity index 99% rename from src/Eloquent/Enumeration/AbstractMultiton.php rename to src/AbstractMultiton.php index 17df9f3..fff55b1 100644 --- a/src/Eloquent/Enumeration/AbstractMultiton.php +++ b/src/AbstractMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/AbstractValueMultiton.php b/src/AbstractValueMultiton.php similarity index 98% rename from src/Eloquent/Enumeration/AbstractValueMultiton.php rename to src/AbstractValueMultiton.php index bcfc2e2..ead96ed 100644 --- a/src/Eloquent/Enumeration/AbstractValueMultiton.php +++ b/src/AbstractValueMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/EnumerationInterface.php b/src/EnumerationInterface.php similarity index 91% rename from src/Eloquent/Enumeration/EnumerationInterface.php rename to src/EnumerationInterface.php index 9e42ab7..fa2f202 100644 --- a/src/Eloquent/Enumeration/EnumerationInterface.php +++ b/src/EnumerationInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/Exception/AbstractUndefinedMemberException.php b/src/Exception/AbstractUndefinedMemberException.php similarity index 98% rename from src/Eloquent/Enumeration/Exception/AbstractUndefinedMemberException.php rename to src/Exception/AbstractUndefinedMemberException.php index 8e8488f..da48529 100644 --- a/src/Eloquent/Enumeration/Exception/AbstractUndefinedMemberException.php +++ b/src/Exception/AbstractUndefinedMemberException.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/Exception/ExtendsConcreteException.php b/src/Exception/ExtendsConcreteException.php similarity index 98% rename from src/Eloquent/Enumeration/Exception/ExtendsConcreteException.php rename to src/Exception/ExtendsConcreteException.php index e7c0b6d..be15d7a 100644 --- a/src/Eloquent/Enumeration/Exception/ExtendsConcreteException.php +++ b/src/Exception/ExtendsConcreteException.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/Exception/UndefinedMemberException.php b/src/Exception/UndefinedMemberException.php similarity index 97% rename from src/Eloquent/Enumeration/Exception/UndefinedMemberException.php rename to src/Exception/UndefinedMemberException.php index 30b4482..c4167e2 100644 --- a/src/Eloquent/Enumeration/Exception/UndefinedMemberException.php +++ b/src/Exception/UndefinedMemberException.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/Exception/UndefinedMemberExceptionInterface.php b/src/Exception/UndefinedMemberExceptionInterface.php similarity index 95% rename from src/Eloquent/Enumeration/Exception/UndefinedMemberExceptionInterface.php rename to src/Exception/UndefinedMemberExceptionInterface.php index 674e069..a0b71d9 100644 --- a/src/Eloquent/Enumeration/Exception/UndefinedMemberExceptionInterface.php +++ b/src/Exception/UndefinedMemberExceptionInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/MultitonInterface.php b/src/MultitonInterface.php similarity index 97% rename from src/Eloquent/Enumeration/MultitonInterface.php rename to src/MultitonInterface.php index 411e233..1de11a6 100644 --- a/src/Eloquent/Enumeration/MultitonInterface.php +++ b/src/MultitonInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/src/Eloquent/Enumeration/ValueMultitonInterface.php b/src/ValueMultitonInterface.php similarity index 93% rename from src/Eloquent/Enumeration/ValueMultitonInterface.php rename to src/ValueMultitonInterface.php index a4a9583..4fc02c4 100644 --- a/src/Eloquent/Enumeration/ValueMultitonInterface.php +++ b/src/ValueMultitonInterface.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/InvalidEnumeration.php b/test/src/Eloquent/Enumeration/Test/Fixture/InvalidEnumeration.php index b3a5f0d..a3c8fa6 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/InvalidEnumeration.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/InvalidEnumeration.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/InvalidMultiton.php b/test/src/Eloquent/Enumeration/Test/Fixture/InvalidMultiton.php index 946acbe..8e32325 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/InvalidMultiton.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/InvalidMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/InvalidValueMultiton.php b/test/src/Eloquent/Enumeration/Test/Fixture/InvalidValueMultiton.php index 1fa17eb..04e7227 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/InvalidValueMultiton.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/InvalidValueMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/TestEnumeration.php b/test/src/Eloquent/Enumeration/Test/Fixture/TestEnumeration.php index 770ed50..21519c3 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/TestEnumeration.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/TestEnumeration.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/TestMultiton.php b/test/src/Eloquent/Enumeration/Test/Fixture/TestMultiton.php index 0c13ab9..ab5a07c 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/TestMultiton.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/TestMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/TestValueMultiton.php b/test/src/Eloquent/Enumeration/Test/Fixture/TestValueMultiton.php index ca51291..e731f48 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/TestValueMultiton.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/TestValueMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/ValidEnumeration.php b/test/src/Eloquent/Enumeration/Test/Fixture/ValidEnumeration.php index d36c0f3..3e6e23b 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/ValidEnumeration.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/ValidEnumeration.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/ValidMultiton.php b/test/src/Eloquent/Enumeration/Test/Fixture/ValidMultiton.php index a7b165f..0e2d616 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/ValidMultiton.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/ValidMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Eloquent/Enumeration/Test/Fixture/ValidValueMultiton.php b/test/src/Eloquent/Enumeration/Test/Fixture/ValidValueMultiton.php index 83134e1..f95ecc5 100644 --- a/test/src/Eloquent/Enumeration/Test/Fixture/ValidValueMultiton.php +++ b/test/src/Eloquent/Enumeration/Test/Fixture/ValidValueMultiton.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/HttpRequestMethod.php b/test/src/HttpRequestMethod.php index e6fb7b7..24472f2 100644 --- a/test/src/HttpRequestMethod.php +++ b/test/src/HttpRequestMethod.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/src/Planet.php b/test/src/Planet.php index 3a37d0e..21916b8 100644 --- a/test/src/Planet.php +++ b/test/src/Planet.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/suite/Eloquent/Enumeration/AbstractEnumerationTest.php b/test/suite/AbstractEnumerationTest.php similarity index 99% rename from test/suite/Eloquent/Enumeration/AbstractEnumerationTest.php rename to test/suite/AbstractEnumerationTest.php index 37cadc2..20d3389 100644 --- a/test/suite/Eloquent/Enumeration/AbstractEnumerationTest.php +++ b/test/suite/AbstractEnumerationTest.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/suite/Eloquent/Enumeration/AbstractMultitonTest.php b/test/suite/AbstractMultitonTest.php similarity index 99% rename from test/suite/Eloquent/Enumeration/AbstractMultitonTest.php rename to test/suite/AbstractMultitonTest.php index 337ecb5..a3a9bf8 100644 --- a/test/suite/Eloquent/Enumeration/AbstractMultitonTest.php +++ b/test/suite/AbstractMultitonTest.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/suite/Eloquent/Enumeration/AbstractValueMultitonTest.php b/test/suite/AbstractValueMultitonTest.php similarity index 99% rename from test/suite/Eloquent/Enumeration/AbstractValueMultitonTest.php rename to test/suite/AbstractValueMultitonTest.php index 988f1e9..8da4798 100644 --- a/test/suite/Eloquent/Enumeration/AbstractValueMultitonTest.php +++ b/test/suite/AbstractValueMultitonTest.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/suite/Eloquent/Enumeration/Exception/ExtendsConcreteExceptionTest.php b/test/suite/Exception/ExtendsConcreteExceptionTest.php similarity index 96% rename from test/suite/Eloquent/Enumeration/Exception/ExtendsConcreteExceptionTest.php rename to test/suite/Exception/ExtendsConcreteExceptionTest.php index f255a30..2843367 100644 --- a/test/suite/Eloquent/Enumeration/Exception/ExtendsConcreteExceptionTest.php +++ b/test/suite/Exception/ExtendsConcreteExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/suite/Eloquent/Enumeration/Exception/UndefinedMemberExceptionTest.php b/test/suite/Exception/UndefinedMemberExceptionTest.php similarity index 97% rename from test/suite/Eloquent/Enumeration/Exception/UndefinedMemberExceptionTest.php rename to test/suite/Exception/UndefinedMemberExceptionTest.php index 1c10b80..9f3495a 100644 --- a/test/suite/Eloquent/Enumeration/Exception/UndefinedMemberExceptionTest.php +++ b/test/suite/Exception/UndefinedMemberExceptionTest.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. diff --git a/test/suite/Eloquent/Enumeration/FunctionalTest.php b/test/suite/FunctionalTest.php similarity index 99% rename from test/suite/Eloquent/Enumeration/FunctionalTest.php rename to test/suite/FunctionalTest.php index 883c4a7..5d67a8f 100644 --- a/test/suite/Eloquent/Enumeration/FunctionalTest.php +++ b/test/suite/FunctionalTest.php @@ -3,7 +3,7 @@ /* * This file is part of the Enumeration package. * - * Copyright © 2013 Erin Millard + * Copyright © 2014 Erin Millard * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. From 95e73107753ddc253947c575a545531d99fe4677 Mon Sep 17 00:00:00 2001 From: Erin Millard Date: Wed, 29 Jan 2014 19:24:04 +1000 Subject: [PATCH 3/4] Minor readme tweaks. [ci skip] --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 328659e..66820b7 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 From d698ff0f2340aa90a255b429a88c2631c62f4f32 Mon Sep 17 00:00:00 2001 From: Erin Millard Date: Wed, 29 Jan 2014 19:28:06 +1000 Subject: [PATCH 4/4] Updated changelog, readme. --- CHANGELOG.md | 4 ++++ README.md | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5038048..555db6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: diff --git a/README.md b/README.md index 66820b7..f592427 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ *An enumeration implementation for PHP.* -[![The most recent stable version is 5.0.0][version-image]][Semantic versioning] +[![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] @@ -274,4 +274,4 @@ function handleCustomHttpRequest( [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.0-brightgreen.svg "This project uses semantic versioning" +[version-image]: http://img.shields.io/:semver-5.0.1-brightgreen.svg "This project uses semantic versioning"