Skip to content

Commit

Permalink
Merge pull request #337 from Rican7/chore/v2.1.1-release-prep
Browse files Browse the repository at this point in the history
Chore - v2.1.1 release prep
  • Loading branch information
Rican7 authored Nov 1, 2016
2 parents fdf072b + 391e9e0 commit 94a0574
Show file tree
Hide file tree
Showing 55 changed files with 97 additions and 58 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# CHANGELOG


## 2.1.1

### Features

- Header keys are now normalized, by default, to their canonical MIME format for consistency
- Header key normalization is now customizable
- Internal callback data-structures were moved from arrays to more appropriate SplQueue and SplStack instances, providing performance and memory footprint improvements
- The PHPUnit version used for tests has been updated for HHVM compatibility
- PHP 7.0 and HHVM compatibility!

### Bug fixes

- A few internal property/attribute names have been updated for consistency
- An iteration bug effecting tests run under certain HHVM runtime versions has been fixed
- The README document has been updated to fix a few errors
- The `file()` method in the `Response` class has been updated to fix an issue found when run under PHP-FPM
- The `file()` method in the `Response` class will no longer send the `Content-Length` header when the response has been chunked, to comply with the HTTP requirements defined in RFC 2616
- References to the old https://github.com/chriso/klein.php repository URL have been updated to the new repository URL home of Klein: https://github.com/klein/klein.php
- Tests were updated to pass under an expanded number of PHP runtime versions and configurations
- A potential output buffer stack miss-handling in the dispatch process has been fixed


## 2.1.0

### Features
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Klein.php

[![Build Status](https://travis-ci.org/chriso/klein.php.png?branch=master)](https://travis-ci.org/chriso/klein.php)
[![Build Status](https://travis-ci.org/klein/klein.php.png?branch=master)](https://travis-ci.org/klein/klein.php)

**klein.php** is a fast & flexible router for PHP 5.3+

Expand Down Expand Up @@ -420,7 +420,7 @@ See the [contributing guide](CONTRIBUTING.md) for more info

## More information

See the [wiki](https://github.com/chriso/klein.php/wiki) for more information
See the [wiki](https://github.com/klein/klein.php/wiki) for more information

## Contributors

Expand Down
16 changes: 16 additions & 0 deletions UPGRADING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Klein Upgrade Guide


## 2.1.0 to 2.1.1

### Deprecations

- The `HeaderDataCollection::normalizeName()` method has been deprecated in favor of using new normalization options (via constant switches) and other more specific methods on the same class

### Interface Changes

- Three of the Klein internal callback attributes have changed both name and data structure. These attributes are protected, so the effect will only be felt by users that have extended and/or overwritten Klein's internal behaviors. The following changes were made:
- `Klein#errorCallbacks` was renamed to `Klein#error_callbacks` and it's array data-structure was changed to use an `SplStack`
- `Klein#httpErrorCallbacks` was renamed to `Klein#http_error_callbacks` and it's array data-structure was changed to use an `SplStack`
- `Klein#afterFilterCallbacks` was renamed to `Klein#after_filter_callbacks` and it's array data-structure was changed to use an `SplQueue`
- `Validator#defaultAdded` was renamed to `Validator#default_added`


## 2.0.x to 2.1.0

### Deprecations
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "klein/klein",
"description": "A lightning fast router for PHP",
"keywords": ["router", "routing", "sinatra", "boilerplate"],
"homepage": "https://github.com/chriso/klein.php",
"homepage": "https://github.com/klein/klein.php",
"license": "MIT",
"authors": [
{
Expand All @@ -14,7 +14,7 @@
{
"name": "Trevor Suarez",
"email": "rican7@gmail.com",
"homepage": "http://about.me/tnsuarez",
"homepage": "https://trevorsuarez.com/",
"role": "Contributor/Developer"
}
],
Expand Down
4 changes: 2 additions & 2 deletions src/Klein/AbstractResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down Expand Up @@ -428,7 +428,7 @@ public function isSent()
/**
* Enable response chunking
*
* @link https://github.com/chriso/klein.php/wiki/Response-Chunking
* @link https://github.com/klein/klein.php/wiki/Response-Chunking
* @link http://bit.ly/hg3gHb
* @return AbstractResponse
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Klein/AbstractRouteFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/DataCollection/DataCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/DataCollection/HeaderDataCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/DataCollection/ResponseCookieDataCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/DataCollection/RouteCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/DataCollection/ServerDataCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/DispatchHaltedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/DuplicateServiceException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/HttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/HttpExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/KleinExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/LockedResponseException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/ResponseAlreadySentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/RoutePathCompilationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/UnhandledException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/UnknownServiceException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Exceptions/ValidationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/HttpStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
4 changes: 2 additions & 2 deletions src/Klein/Klein.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down Expand Up @@ -575,7 +575,7 @@ public function dispatch(
* @link http://www.faqs.org/rfcs/rfc3986
*
* Decode here AFTER matching as per @chriso's suggestion
* @link https://github.com/chriso/klein.php/issues/117#issuecomment-21093915
* @link https://github.com/klein/klein.php/issues/117#issuecomment-21093915
*/
$params = array_map('rawurldecode', $params);

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
4 changes: 2 additions & 2 deletions src/Klein/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand All @@ -27,7 +27,7 @@ class Response extends AbstractResponse
/**
* Enable response chunking
*
* @link https://github.com/chriso/klein.php/wiki/Response-Chunking
* @link https://github.com/klein/klein.php/wiki/Response-Chunking
* @link http://bit.ly/hg3gHb
* @param string $str An optional string to send as a response "chunk"
* @return Response
Expand Down
2 changes: 1 addition & 1 deletion src/Klein/ResponseCookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/RouteFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion src/Klein/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/Klein/Tests/AbstractKleinTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/Klein/Tests/AbstractRouteFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @author Chris O'Hara <cohara87@gmail.com>
* @author Trevor Suarez (Rican7) (contributor and v2 refactorer)
* @copyright (c) Chris O'Hara
* @link https://github.com/chriso/klein.php
* @link https://github.com/klein/klein.php
* @license MIT
*/

Expand Down
Loading

0 comments on commit 94a0574

Please sign in to comment.