cs fixer update

Author: dbu

.github/workflows/static.yml

@@ -31,6 +31,6 @@ jobs:
         uses: actions/checkout@v3
 
       - name: PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga:2.19.0
+        uses: docker://oskarstark/php-cs-fixer-ga
         with:
           args: --dry-run --diff-format udiff

.gitignore

@@ -1,5 +1,5 @@
-.php_cs
-.php_cs.cache
+.php-cs-fixer.php
+.php-cs-fixer.cache
 /build/
 /composer.lock
 /phpspec.yml

.php-cs-fixer.dist.php

@@ -0,0 +1,18 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/spec')
+    ->name('*.php')
+;
+
+$config = new PhpCsFixer\Config();
+
+return $config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        'single_line_throw' => false,
+    ])
+    ->setFinder($finder)
+;

.php_cs.dist

@@ -3,23 +3,22 @@
 namespace spec\Http\Message\Authentication;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
 class AutoBasicAuthSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\AutoBasicAuth');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(
+    public function it_authenticates_a_request(
         RequestInterface $request,
         UriInterface $uri,
         UriInterface $uriWithoutUserInfo,
@@ -38,7 +37,7 @@ function it_authenticates_a_request(
         $this->authenticate($request)->shouldReturn($authenticatedRequest);
     }
 
-    function it_authenticates_a_request_without_password(
+    public function it_authenticates_a_request_without_password(
         RequestInterface $request,
         UriInterface $uri,
         UriInterface $uriWithoutUserInfo,
@@ -57,15 +56,15 @@ function it_authenticates_a_request_without_password(
         $this->authenticate($request)->shouldReturn($authenticatedRequest);
     }
 
-    function it_does_not_authenticate_a_request(RequestInterface $request, UriInterface $uri)
+    public function it_does_not_authenticate_a_request(RequestInterface $request, UriInterface $uri)
     {
         $request->getUri()->willReturn($uri);
         $uri->getUserInfo()->willReturn('');
 
         $this->authenticate($request)->shouldReturn($request);
     }
 
-    function it_authenticates_a_request_without_user_info_removal(
+    public function it_authenticates_a_request_without_user_info_removal(
         RequestInterface $request,
         UriInterface $uri,
         RequestInterface $authenticatedRequest

spec/Authentication/AutoBasicAuthSpec.php

@@ -2,27 +2,27 @@
 
 namespace spec\Http\Message\Authentication;
 
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class BasicAuthSpec extends ObjectBehavior
 {
-    function let()
+    public function let()
     {
         $this->beConstructedWith('john.doe', 'secret');
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\BasicAuth');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
+    public function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Basic '.base64_encode('john.doe:secret'))->willReturn($newRequest);
 

spec/Authentication/BasicAuthSpec.php

@@ -2,27 +2,27 @@
 
 namespace spec\Http\Message\Authentication;
 
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class BearerSpec extends ObjectBehavior
 {
-    function let()
+    public function let()
     {
         $this->beConstructedWith('token');
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Bearer');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
+    public function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('Authorization', 'Bearer token')->willReturn($newRequest);
 

spec/Authentication/BearerSpec.php

@@ -3,29 +3,29 @@
 namespace spec\Http\Message\Authentication;
 
 use Http\Message\Authentication;
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class ChainSpec extends ObjectBehavior
 {
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Chain');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_throws_an_exception_when_non_authentication_is_passed()
+    public function it_throws_an_exception_when_non_authentication_is_passed()
     {
         $this->beConstructedWith(['authentication']);
 
         $this->shouldThrow('InvalidArgumentException')->duringInstantiation();
     }
 
-    function it_authenticates_a_request(
+    public function it_authenticates_a_request(
         Authentication $auth1,
         Authentication $auth2,
         RequestInterface $originalRequest,

spec/Authentication/ChainSpec.php

@@ -7,22 +7,22 @@
 
 class HeaderSpec extends ObjectBehavior
 {
-    function let()
+    public function let()
     {
         $this->beConstructedWith('X-AUTH-TOKEN', 'REAL');
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Header');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
+    public function it_authenticates_a_request(RequestInterface $request, RequestInterface $newRequest)
     {
         $request->withHeader('X-AUTH-TOKEN', 'REAL')->willReturn($newRequest);
 

spec/Authentication/HeaderSpec.php

@@ -3,38 +3,38 @@
 namespace spec\Http\Message\Authentication;
 
 use Http\Message\Authentication;
-use Psr\Http\Message\RequestInterface;
 use PhpSpec\ObjectBehavior;
+use Psr\Http\Message\RequestInterface;
 
 class MatchingSpec extends ObjectBehavior
 {
-    function let(Authentication $authentication)
+    public function let(Authentication $authentication)
     {
-        $matcher = function($request) { return true; };
+        $matcher = function ($request) { return true; };
 
         $this->beConstructedWith($authentication, $matcher);
     }
 
-    function it_is_initializable()
+    public function it_is_initializable()
     {
         $this->shouldHaveType('Http\Message\Authentication\Matching');
     }
 
-    function it_is_an_authentication()
+    public function it_is_an_authentication()
     {
         $this->shouldImplement('Http\Message\Authentication');
     }
 
-    function it_authenticates_a_request(Authentication $authentication, RequestInterface $request, RequestInterface $newRequest)
+    public function it_authenticates_a_request(Authentication $authentication, RequestInterface $request, RequestInterface $newRequest)
     {
         $authentication->authenticate($request)->willReturn($newRequest);
 
         $this->authenticate($request)->shouldReturn($newRequest);
     }
 
-    function it_does_not_authenticate_a_request(Authentication $authentication, RequestInterface $request)
+    public function it_does_not_authenticate_a_request(Authentication $authentication, RequestInterface $request)
     {
-        $matcher = function($request) { return false; };
+        $matcher = function ($request) { return false; };
 
         $this->beConstructedWith($authentication, $matcher);
 
@@ -43,7 +43,7 @@ function it_does_not_authenticate_a_request(Authentication $authentication, Requ
         $this->authenticate($request)->shouldReturn($request);
     }
 
-    function it_creates_a_matcher_from_url(Authentication $authentication)
+    public function it_creates_a_matcher_from_url(Authentication $authentication)
     {
         $this->createUrlMatcher($authentication, 'url')->shouldHaveType('Http\Message\Authentication\Matching');
     }