Merge branch 'hotfix/tooling'

Close #1
Close #4
Close #5
Close #6
Close #7

Author: weierophinney

.gitattributes

@@ -1,8 +1,10 @@
 /docs export-ignore
 /test export-ignore
+/.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
+/composer.lock export-ignore
 /mkdocs.yml export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore

CONDUCT.md

@@ -4,13 +4,13 @@
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>
-        <testsuite name="zend-expressive-cache">
+        <testsuite name="zend-expressive-authorization">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
 
     <filter>
-        <whitelist>
+        <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>

CONTRIBUTING.md

@@ -13,10 +13,6 @@ interface AuthorizationInterface
 {
     /**
      * Check if a role is granted for the request
-     *
-     * @param string $role
-     * @param ServerRequestInterface $request
-     * @return bool
      */
-    public function isGranted(string $role, ServerRequestInterface $request): bool;
+    public function isGranted(string $role, ServerRequestInterface $request) : bool;
 }

phpunit.xml.dist

@@ -24,13 +24,6 @@ class AuthorizationMiddleware implements ServerMiddlewareInterface
      */
     private $responsePrototype;
 
-    /**
-     * Constructor
-     *
-     * @param Rbac $rbac
-     * @param MiddlewareAssertionInterface $assertion
-     * @return void
-     */
     public function __construct(AuthorizationInterface $authorization, ResponseInterface $responsePrototype)
     {
         $this->authorization = $authorization;

src/AuthorizationInterface.php

@@ -10,7 +10,6 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Zend\Diactoros\Response;
-use Zend\Expressive\Authorization\AuthorizationInterface;
 
 class AuthorizationMiddlewareFactory
 {

src/AuthorizationMiddleware.php

@@ -7,8 +7,6 @@
 
 namespace Zend\Expressive\Authorization;
 
-use Zend\Permission\Rbac\Rbac;
-
 class ConfigProvider
 {
     /**

src/AuthorizationMiddlewareFactory.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @see       https://github.com/zendframework/zend-expressive-cache for the canonical source repository
+ * @see       https://github.com/zendframework/zend-expressive-authorization for the canonical source repository
  * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-expressive-cache/blob/master/LICENSE.md New BSD License
+ * @license   https://github.com/zendframework/zend-expressive-authorization/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Expressive\Authorization\Exception;

src/ConfigProvider.php

@@ -13,6 +13,7 @@
 use Zend\Expressive\Authorization\AuthorizationInterface;
 use Zend\Expressive\Authorization\AuthorizationMiddleware;
 use Zend\Expressive\Authorization\AuthorizationMiddlewareFactory;
+use Zend\Expressive\Authorization\Exception;
 
 class AuthorizationMiddlewareFactoryTest extends TestCase
 {
@@ -31,24 +32,20 @@ protected function setUp()
             ->will([$this->response, 'reveal']);
     }
 
-    /**
-     * @expectedException Zend\Expressive\Authorization\Exception\InvalidConfigException
-     */
     public function testFactoryWithoutAuthorization()
     {
         $this->container->has(AuthorizationInterface::class)->willReturn(false);
 
+        $this->expectException(Exception\InvalidConfigException::class);
         $middleware = ($this->factory)($this->container->reveal());
     }
 
-    /**
-     * @expectedException Zend\Expressive\Authorization\Exception\InvalidConfigException
-     */
     public function testFactoryWithoutResponsePrototype()
     {
         $this->container->has(AuthorizationInterface::class)->willReturn(true);
         $this->container->has(ResponseInterface::class)->willReturn(false);
 
+        $this->expectException(Exception\InvalidConfigException::class);
         $middleware = ($this->factory)($this->container->reveal());
     }