Promote to top-level namespace

CONTRIBUTING.md

@@ -62,10 +62,10 @@ To run tests:
 
   If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
 
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
+- Run the tests:
 
   ```console
-  $ ./vendor/bin/phpunit
+  $ composer test
   ```
 
 You can turn on conditional tests with the phpunit.xml file.
@@ -77,24 +77,21 @@ To do so:
 
 ## Running Coding Standards Checks
 
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
+Coding standards check tools are installed by default via Composer.
 
 To run checks only:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+$ composer cs-check
 ```
 
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
+To attempt to automatically fix problems:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+$ composer cs-fix
 ```
 
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
+If you allow the tool to fix CS issues, please re-run the tests to ensure
 they pass, and make sure you add and commit the changes after verification.
 
 ## Recommended Workflow for Contributions

README.md

@@ -3,11 +3,10 @@
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-router.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-router)
 [![Coverage Status](https://coveralls.io/repos/zendframework/zend-router/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-router?branch=master)
 
-zend-router provides flexible HTTP and console routing.
+zend-router provides flexible HTTP routing.
 
-HTTP-based routing currently works against the
-[zend-http](https://github.com/zendframework/zend-http) request and responses,
-and provides capabilities around:
+Routing currently works against the [zend-http](https://github.com/zendframework/zend-http)
+request and responses, and provides capabilities around:
 
 - Literal path matches
 - Path segment matches (at path boundaries, and optionally validated using regex)
@@ -19,9 +18,5 @@ and provides capabilities around:
 Additionally, it supports combinations of different route types in tree
 structures, allowing for fast, b-tree lookups.
 
-Console routing leverages [zend-console's routing capabilities](http://zendframework.github.io/zend-console/routes/),
-providing a unified mechanism for working with routes regardless of the
-enviornment.
-
 - File issues at https://github.com/zendframework/zend-router/issues
 - Documentation is at https://zendframework.github.io/zend-router/

composer.json

@@ -4,12 +4,13 @@
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
-        "mvc"
+        "mvc",
+        "routing"
     ],
     "homepage": "https://github.com/zendframework/zend-router",
     "autoload": {
         "psr-4": {
-            "Zend\\Mvc\\Router\\": "src/"
+            "Zend\\Router\\": "src/"
         }
     },
     "require": {
@@ -20,30 +21,26 @@
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
     },
     "require-dev": {
-        "zendframework/zend-console": "^2.6",
-        "zendframework/zend-filter": "^2.6.1",
         "zendframework/zend-i18n": "^2.6",
-        "zendframework/zend-uri": "^2.5",
-        "zendframework/zend-validator": "^2.6",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "^4.5",
+        "squizlabs/php_codesniffer": "^2.3",
+        "phpunit/phpunit": "^4.5",
         "sebastian/version": "^1.0.4"
     },
     "suggest": {
-        "zendframework/zend-console": "Zend\\Console component",
-        "zendframework/zend-filter": "Zend\\Filter component",
-        "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
-        "zendframework/zend-validator": "Zend\\Validator component"
+        "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments"
     },
     "extra": {
         "branch-alias": {
             "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-develop": "3.0-dev"
+        },
+        "zf": {
+            "component": "Zend\\Mvc\\Router"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ZendTest\\Mvc\\Router\\": "test/"
+            "ZendTest\\Router\\": "test/"
         }
     },
     "scripts": {
@@ -52,8 +49,8 @@
             "@test"
         ],
         "upload-coverage": "coveralls",
-        "cs-check": "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run",
-        "cs-fix": "php-cs-fixer fix -v",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover clover.xml"
     }