Merge pull request #13 from php-http/improve_authentication

Remove getters from authentication methods

Author: sagikazarmark

spec/Authentication/BasicAuthSpec.php

@@ -19,16 +19,6 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\BasicAuth');
     }
 
-    function it_has_a_username()
-    {
-        $this->getUsername()->shouldReturn('john.doe');
-    }
-
-    function it_has_a_password()
-    {
-        $this->getPassword()->shouldReturn('secret');
-    }
-
     function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Basic '.base64_encode('john.doe:secret'))->willReturn($newRequest);

spec/Authentication/BearerSpec.php

@@ -19,11 +19,6 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\Bearer');
     }
 
-    function it_has_a_token()
-    {
-        $this->getToken()->shouldReturn('token');
-    }
-
     function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Bearer token')->willReturn($newRequest);

spec/Authentication/ChainSpec.php

@@ -15,15 +15,6 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\Chain');
     }
 
-    function it_accepts_an_authentication_chain_in_the_constructor(Authentication $auth1, Authentication $auth2)
-    {
-        $chain = [$auth1, $auth2];
-
-        $this->beConstructedWith($chain);
-
-        $this->getAuthenticationChain()->shouldReturn($chain);
-    }
-
     function it_throws_an_exception_when_non_authentication_is_passed()
     {
         $this->beConstructedWith(['authentication']);

spec/Authentication/MatchingSpec.php

@@ -24,16 +24,6 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\Matching');
     }
 
-    function it_has_an_authentication(Authentication $authentication)
-    {
-        $this->getAuthentication()->shouldReturn($authentication);
-    }
-
-    function it_has_a_matcher()
-    {
-        $this->getMatcher()->shouldReturn($this->matcher);
-    }
-
     function it_authenticates_a_request(Authentication $authentication, RequestInterface $request, RequestInterface $newRequest)
     {
         $authentication->authenticate($request)->willReturn($newRequest);

spec/Authentication/WsseSpec.php

@@ -20,16 +20,6 @@ function it_is_initializable()
         $this->shouldHaveType('Http\Message\Authentication\Wsse');
     }
 
-    function it_has_a_username()
-    {
-        $this->getUsername()->shouldReturn('john.doe');
-    }
-
-    function it_has_a_password()
-    {
-        $this->getPassword()->shouldReturn('secret');
-    }
-
     function it_authenticates_a_request(
         RequestInterface $request,
         RequestInterface $newRequest,

src/Authentication/BasicAuth.php

@@ -12,7 +12,15 @@
  */
 final class BasicAuth implements Authentication
 {
-    use UserPasswordPair;
+    /**
+     * @var string
+     */
+    private $username;
+
+    /**
+     * @var string
+     */
+    private $password;
 
     /**
      * @param string $username

src/Authentication/Bearer.php

@@ -25,16 +25,6 @@ public function __construct($token)
         $this->token = $token;
     }
 
-    /**
-     * Returns the token.
-     *
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
     /**
      * {@inheritdoc}
      */

src/Authentication/Chain.php

@@ -33,16 +33,6 @@ public function __construct(array $authenticationChain = [])
         $this->authenticationChain = $authenticationChain;
     }
 
-    /**
-     * Returns the current authentication chain.
-     *
-     * @return Authentication[]
-     */
-    public function getAuthenticationChain()
-    {
-        return $this->authenticationChain;
-    }
-
     /**
      * {@inheritdoc}
      */

src/Authentication/Matching.php

@@ -38,26 +38,6 @@ public function __construct(Authentication $authentication, callable $matcher =
         $this->matcher = $matcher;
     }
 
-    /**
-     * Returns the authentication.
-     *
-     * @return string
-     */
-    public function getAuthentication()
-    {
-        return $this->authentication;
-    }
-
-    /**
-     * Returns the matcher.
-     *
-     * @return callable
-     */
-    public function getMatcher()
-    {
-        return $this->matcher;
-    }
-
     /**
      * {@inheritdoc}
      */