Skip to content

Commit

Permalink
Rewriting as Laminas Project package
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Dec 31, 2019
1 parent e76e6ab commit 7c6b493
Show file tree
Hide file tree
Showing 54 changed files with 467 additions and 2,837 deletions.
6 changes: 3 additions & 3 deletions .docheader
@@ -1,7 +1,7 @@
/**
* @see https://github.com/zendframework/zend-expressive-router for the canonical source repository
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (https://www.zend.com)
* @license https://github.com/zendframework/zend-expressive-router/blob/master/LICENSE.md New BSD License
* @see https://github.com/mezzio/mezzio-router for the canonical source repository
* @copyright https://github.com/mezzio/mezzio-router/blob/master/COPYRIGHT.md
* @license https://github.com/mezzio/mezzio-router/blob/master/LICENSE.md New BSD License
*/

declare(strict_types=1);
1 change: 0 additions & 1 deletion .gitattributes
Expand Up @@ -3,7 +3,6 @@
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/composer.lock export-ignore
/docs/ export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
Expand Down
1 change: 1 addition & 0 deletions .gitignore
@@ -1,5 +1,6 @@
/.phpunit.result.cache
/clover.xml
/composer.lock
/coveralls-upload.json
/phpunit.xml
/vendor/
13 changes: 2 additions & 11 deletions .travis.yml
Expand Up @@ -10,34 +10,25 @@ env:
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
fast_finish: true
include:
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- DEPS=latest
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=locked
- php: 7.2
env:
- DEPS=latest
- php: 7.3
env:
- DEPS=lowest
- php: 7.3
env:
- DEPS=locked
- php: 7.3
env:
- DEPS=latest
Expand Down
214 changes: 107 additions & 107 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions COPYRIGHT.md
@@ -0,0 +1,2 @@
Copyright (c) 2019, Laminas Foundation.
All rights reserved. (https://getlaminas.org/)
18 changes: 9 additions & 9 deletions LICENSE.md
@@ -1,19 +1,19 @@
Copyright (c) 2015-2019, Zend Technologies USA, Inc.
Copyright (c) 2019, Laminas Foundation
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

- Neither the name of Zend Technologies USA, Inc. nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
- Neither the name of Laminas Foundation nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand Down
22 changes: 11 additions & 11 deletions README.md
@@ -1,9 +1,9 @@
# zend-expressive-router
# mezzio-router

[![Build Status](https://secure.travis-ci.org/zendframework/zend-expressive-router.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-expressive-router)
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-expressive-router/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-expressive-router?branch=master)
[![Build Status](https://travis-ci.org/mezzio/mezzio-router.svg?branch=master)](https://travis-ci.org/mezzio/mezzio-router)
[![Coverage Status](https://coveralls.io/repos/github/mezzio/mezzio-router/badge.svg?branch=master)](https://coveralls.io/github/mezzio/mezzio-router?branch=master)

Router subcomponent for [Expressive](https://github.com/zendframework/zend-expressive).
Router subcomponent for [Mezzio](https://github.com/mezzio/mezzio).

This package provides the following classes and interfaces:

Expand All @@ -15,23 +15,23 @@ This package provides the following classes and interfaces:

## Installation

Typically, you will install this when installing Expressive. However, it can be
Typically, you will install this when installing Mezzio. However, it can be
used standalone to provide a generic way to provide routed PSR-7 middleware. To
do this, use:

```bash
$ composer require zendframework/zend-expressive-router
$ composer require mezzio/mezzio-router
```

We currently support and provide the following routing integrations:

- [Aura.Router](https://github.com/auraphp/Aura.Router):
`composer require zendframework/zend-expressive-aurarouter`
`composer require mezzio/mezzio-aurarouter`
- [FastRoute](https://github.com/nikic/FastRoute):
`composer require zendframework/zend-expressive-fastroute`
- [zend-router](https://github.com/zendframework/zend-router):
`composer require zendframework/zend-expressive-zendrouter`
`composer require mezzio/mezzio-fastroute`
- [laminas-router](https://github.com/laminas/laminas-router):
`composer require mezzio/mezzio-laminasrouter`

## Documentation

Expressive provides [routing documentation](https://docs.zendframework.com/zend-expressive/features/router/intro/).
Mezzio provides [routing documentation](https://docs.mezzio.dev/mezzio/features/router/intro/).
66 changes: 35 additions & 31 deletions composer.json
@@ -1,61 +1,62 @@
{
"name": "zendframework/zend-expressive-router",
"description": "Router subcomponent for Expressive",
"name": "mezzio/mezzio-router",
"description": "Router subcomponent for Mezzio",
"license": "BSD-3-Clause",
"keywords": [
"expressive",
"laminas",
"mezzio",
"http",
"middleware",
"psr",
"psr-7",
"zf",
"zendframework",
"zend-expressive"
"psr-7"
],
"homepage": "https://mezzio.dev",
"support": {
"issues": "https://github.com/zendframework/zend-expressive-router/issues",
"source": "https://github.com/zendframework/zend-expressive-router",
"rss": "https://github.com/zendframework/zend-expressive-router/releases.atom",
"chat": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/expressive"
"docs": "https://docs.mezzio.dev/mezzio-router/",
"issues": "https://github.com/mezzio/mezzio-router/issues",
"source": "https://github.com/mezzio/mezzio-router",
"rss": "https://github.com/mezzio/mezzio-router/releases.atom",
"chat": "https://laminas.dev/chat",
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "3.1.x-dev",
"dev-develop": "3.2.x-dev"
},
"laminas": {
"config-provider": "Mezzio\\Router\\ConfigProvider"
}
},
"require": {
"php": "^7.1",
"fig/http-message-util": "^1.1.2",
"laminas/laminas-zendframework-bridge": "^1.0",
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
"malukenho/docheader": "^0.1.6",
"phpunit/phpunit": "^7.5.16 || ^8.4.1",
"zendframework/zend-coding-standard": "~1.0.0"
"phpunit/phpunit": "^7.5.16 || ^8.4.1"
},
"suggest": {
"zendframework/zend-expressive-aurarouter": "^3.0 to use the Aura.Router routing adapter",
"zendframework/zend-expressive-fastroute": "^3.0 to use the FastRoute routing adapter",
"zendframework/zend-expressive-zendrouter": "^3.0 to use the zend-router routing adapter"
"mezzio/mezzio-aurarouter": "^3.0 to use the Aura.Router routing adapter",
"mezzio/mezzio-fastroute": "^3.0 to use the FastRoute routing adapter",
"mezzio/mezzio-laminasrouter": "^3.0 to use the laminas-router routing adapter"
},
"autoload": {
"psr-4": {
"Zend\\Expressive\\Router\\": "src/"
"Mezzio\\Router\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Expressive\\Router\\": "test/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "3.1.x-dev",
"dev-develop": "3.2.x-dev"
},
"zf": {
"config-provider": "Zend\\Expressive\\Router\\ConfigProvider"
"MezzioTest\\Router\\": "test/"
}
},
"scripts": {
Expand All @@ -69,5 +70,8 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"license-check": "docheader check src/ test/"
},
"replace": {
"zendframework/zend-expressive-router": "self.version"
}
}

0 comments on commit 7c6b493

Please sign in to comment.